golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better error messages. Props DD32. see #7875 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-24 16:53:35 +00:00
parent 0c56f7027d
commit 0fad23034c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/class-wp-upgrader.php
View File

@ -722,8 +722,12 @@ class WP_Upgrader_Skin {
if ( is_string($errors) ) {
$this->feedback($errors);
} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
foreach ( $errors->get_error_messages() as $message )
$this->feedback($message);
foreach ( $errors->get_error_messages() as $message ) {
if ( $errors->get_error_data() )
$this->feedback($message . ' ' . $errors->get_error_data() );
else
$this->feedback($message);
}
}
}
@ -731,10 +735,12 @@ class WP_Upgrader_Skin {
if ( isset( $this->upgrader->strings[$string]) )
$string = $this->upgrader->strings[$string];
$args = func_get_args();
$args = array_splice($args, 1);
if ( !empty($args) )
$string = vsprintf($string, $args);
if ( strpos($string, '%') !== false ) {
$args = func_get_args();
$args = array_splice($args, 1);
if ( !empty($args) )
$string = vsprintf($string, $args);
}
if ( empty($string) )
return;
show_message($string);