Changeset 11080

Timestamp:

04/24/2009 04:53:35 PM (15 years ago)

Author:

ryan

Message:

Better error messages. Props DD32. see #7875

File:

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

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

@@ -723 +723 @@
             $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);
+            }
         }
     }
@@ -732 +736 @@
             $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;