Ticket #7875: 7875.9.diff

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

@@ -28 +28 @@
                         $this->skin = new WP_Upgrader_Skin();
                 else
                         $this->skin = $skin;
+        }
+        
+        function init() {
                 $this->skin->set_upgrader($this);
+                $this->generic_strings();
         }
 
         function generic_strings() {
@@ -328 +332 @@
         var $result;
 
         function upgrade_strings() {
-                $this->generic_strings();
                 $this->strings['up_to_date'] = __('The plugin is at the latest version.');
                 $this->strings['no_package'] = __('Upgrade package not available.');
                 $this->strings['downloading_package'] = __('Downloading update from %s.');
@@ -341 +344 @@
         }
 
         function install_strings() {
-                $this->generic_strings();
                 $this->strings['no_package'] = __('Install package not available.');
                 $this->strings['downloading_package'] = __('Downloading install package from %s.');
                 $this->strings['unpack_package'] = __('Unpacking the package.');
@@ -352 +354 @@
 
         function install($package) {
 
+                $this->init();
                 $this->install_strings();
 
                 $this->run(array(
@@ -369 +372 @@
 
         function upgrade($plugin) {
 
+                $this->init();
                 $this->upgrade_strings();
 
                 $current = get_transient( 'update_plugins' );
@@ -475 +479 @@
         var $result;
 
         function upgrade_strings() {
-                $this->generic_strings();
                 $this->strings['up_to_date'] = __('The theme is at the latest version.');
                 $this->strings['no_package'] = __('Upgrade package not available.');
                 $this->strings['downloading_package'] = __('Downloading update from %s.');
@@ -487 +490 @@
         }
 
         function install_strings() {
-                $this->generic_strings();
                 $this->strings['no_package'] = __('Install package not available.');
                 $this->strings['downloading_package'] = __('Downloading install package from %s.');
                 $this->strings['unpack_package'] = __('Unpacking the package.');
@@ -497 +499 @@
         }
 
         function install($package) {
-
+                
+                $this->init();
                 $this->install_strings();
 
                 $options = array(
@@ -523 +526 @@
 
         function upgrade($theme) {
 
+                $this->init();
                 $this->upgrade_strings();
 
                 // Is an update available?
@@ -616 +620 @@
 
 }
 
-//Untested.
+
 class Core_Upgrader extends WP_Upgrader {
 
         function upgrade_strings() {
-                $this->generic_strings();
                 $this->strings['up_to_date'] = __('WordPress is at the latest version.');
                 $this->strings['no_package'] = __('Upgrade package not available.');
                 $this->strings['downloading_package'] = __('Downloading update from %s.');
@@ -630 +633 @@
 
         function upgrade($current) {
                 global $wp_filesystem;
+
+                $this->init();
                 $this->upgrade_strings();
 
-
                 if ( !empty($feedback) )
                         add_filter('update_feedback', $feedback);
 
@@ -732 +736 @@
         }
 
         function feedback($string) {
-                if ( isset( $this->upgrader->strings[$string]) )
+                if ( isset( $this->upgrader->strings[$string] ) )
                         $string = $this->upgrader->strings[$string];
 
                 if ( strpos($string, '%') !== false ) {
@@ -829 +833 @@
 
 
                 if ( ! $this->result || is_wp_error($this->result) )
-                        unset( $update_actions['activate_plugin'] );
+                        unset( $install_actions['activate_plugin'] );
 
                 $install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
                 if ( ! empty($install_actions) )
@@ -885 +889 @@
                         $install_actions['themes_page'] = '<a href="' . admin_url('themes.php') . '" title="' . attribute_escape(__('Themes page')) . '" target="_parent">' . __('Return to Themes page') . '</a>';
 
                 if ( ! $this->result || is_wp_error($this->result) )
-                        unset( $update_actions['activate'], $update_actions['preview'] );
+                        unset( $install_actions['activate'], $install_actions['preview'] );
 
                 $install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
                 if ( ! empty($install_actions) )