From 55d176020bb2f87ba8f5eb10f689feb7d959ae33 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Tue, 15 Oct 2013 19:50:48 +0000
Subject: [PATCH] In show_message(), only print error data if it is a string.

see #25576, [25775].


git-svn-id: https://develop.svn.wordpress.org/trunk@25796 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 13382754e7..5a3b9706c7 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -296,7 +296,7 @@ function wp_reset_vars( $vars ) {
  */
 function show_message($message) {
 	if ( is_wp_error($message) ){
-		if ( $message->get_error_data() )
+		if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
 			$message = $message->get_error_message() . ': ' . $message->get_error_data();
 		else
 			$message = $message->get_error_message();