Changeset 24276 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

05/16/2013 12:46:36 PM (12 years ago)

Author:

ryan

Message:

Don't show both "update failed" and "update successful" messages when upgrading a theme fails due to connectivity problems.

Props SergeyBiryukov
fixes #23027

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

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

@@ -1313 +1313 @@
             echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
         }
-        if ( !empty($this->result) && !is_wp_error($this->result) ) {
-            echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+        if ( $this->result && ! is_wp_error( $this->result ) ) {
+            if ( ! $this->error )
+                echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
             echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
         }