equal
deleted
inserted
replaced
59 */ |
59 */ |
60 public function get_error_messages() { |
60 public function get_error_messages() { |
61 $messages = array(); |
61 $messages = array(); |
62 |
62 |
63 foreach ( $this->errors->get_error_codes() as $error_code ) { |
63 foreach ( $this->errors->get_error_codes() as $error_code ) { |
64 if ( $this->errors->get_error_data( $error_code ) && is_string( $this->errors->get_error_data( $error_code ) ) ) { |
64 $error_data = $this->errors->get_error_data( $error_code ); |
65 $messages[] = $this->errors->get_error_message( $error_code ) . ' ' . esc_html( strip_tags( $this->errors->get_error_data( $error_code ) ) ); |
65 |
|
66 if ( $error_data && is_string( $error_data ) ) { |
|
67 $messages[] = $this->errors->get_error_message( $error_code ) . ' ' . esc_html( strip_tags( $error_data ) ); |
66 } else { |
68 } else { |
67 $messages[] = $this->errors->get_error_message( $error_code ); |
69 $messages[] = $this->errors->get_error_message( $error_code ); |
68 } |
70 } |
69 } |
71 } |
70 |
72 |
93 } |
95 } |
94 } |
96 } |
95 |
97 |
96 // Count existing errors to generate an unique error code. |
98 // Count existing errors to generate an unique error code. |
97 $errors_count = count( $this->errors->get_error_codes() ); |
99 $errors_count = count( $this->errors->get_error_codes() ); |
98 $this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1 , $string ); |
100 $this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1, $string ); |
99 } elseif ( is_wp_error( $errors ) ) { |
101 } elseif ( is_wp_error( $errors ) ) { |
100 foreach ( $errors->get_error_codes() as $error_code ) { |
102 foreach ( $errors->get_error_codes() as $error_code ) { |
101 $this->errors->add( $error_code, $errors->get_error_message( $error_code ), $errors->get_error_data( $error_code ) ); |
103 $this->errors->add( $error_code, $errors->get_error_message( $error_code ), $errors->get_error_data( $error_code ) ); |
102 } |
104 } |
103 } |
105 } |