Changeset 25775

Timestamp:

10/14/2013 08:19:52 PM (12 years ago)

Author:

nacin

Message:

In the upgrader, only print additional error data if it is a string.

As in [25576], we sometimes want to return additional data that is not necessarily meant for UI consumption.

see #25576.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader-skins.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -66 +66 @@
         } elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
             foreach ( $errors->get_error_messages() as $message ) {
-                if ( $errors->get_error_data() )
+                if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
                     $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) );
                 else
@@ -206 +206 @@
         if ( is_wp_error($error) ) {
             foreach ( $error->get_error_messages() as $emessage ) {
-                if ( $error->get_error_data() )
+                if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
                     $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() );
                 else