From 47e85a9b540c4f9c6b9e3a11d43d7bdd77d01d02 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Mon, 14 Oct 2013 20:19:52 +0000
Subject: [PATCH] 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
---
 src/wp-admin/includes/class-wp-upgrader-skins.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader-skins.php b/src/wp-admin/includes/class-wp-upgrader-skins.php
index d196be883f..a532db201f 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skins.php
@@ -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;