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.


git-svn-id: https://develop.svn.wordpress.org/trunk@25775 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-10-14 20:19:52 +00:00
parent 5db3863d12
commit 47e85a9b54

View File

@ -65,7 +65,7 @@ class WP_Upgrader_Skin {
$this->feedback($errors);
} 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
$this->feedback($message);
@ -205,7 +205,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
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
$messages[] = $emessage;