Ticket #10046: goto.patch

class-wp-upgrader.php

@@ -52 +52 @@
 
                 $this->strings['download_failed'] = __('Download failed.');
                 $this->strings['installing_package'] = __('Installing the latest version.');
-                $this->strings['folder_exists'] = __('Destination folder already exists.');
+                $this->strings['folder_exists'] = __('Destination folder already exists:');
                 $this->strings['mkdir_failed'] = __('Could not create directory.');
                 $this->strings['bad_package'] = __('Incompatible Archive');
 
@@ -205 +205 @@
                 //If we're not clearing the destination folder, and something exists there allready, Bail.
                 if ( ! $clear_destination && $wp_filesystem->exists($remote_destination) ) {
                         $wp_filesystem->delete($remote_source, true); //Clear out the source files.
-                        return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+                        return new WP_Error('folder_exists', $this->strings['folder_exists'], '<span class="code">'.$remote_destination.'</span>.');
                 } else if ( $clear_destination ) {
                         //We're going to clear the destination if theres something there
                         $this->skin->feedback('remove_old');
@@ -825 +825 @@
                         show_message(__('Attempting reactivation of the plugin'));
                         echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
                 }
-                $update_actions =  array(
+                $update_actions = array(
                         'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                        'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
+                        'plugin_installer' => '<a href="' . admin_url('plugin-install.php') . '" title="' . esc_attr__('Go to Plugin Installer') . '" target="_parent">' . __('Go to Plugin Installer') . '</a>',
+                        'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Return to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
                 );
                 if ( $this->plugin_active )
                         unset( $update_actions['activate_plugin'] );
@@ -881 +882 @@
                                                         );
 
                 if ( $this->type == 'web' )
-                        $install_actions['plugins_page'] = '<a href="' . admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>';
+                        $install_actions['plugins_page'] = '
+                                <a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Go to Plugins page') . '" target="_parent">' . __('Go to Plugins page') . '</a> |
+                                <a href="' . admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>
+                        ';
                 else
-                        $install_actions['plugins_page'] = '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
+                        $install_actions['plugins_page'] = '
+                                <a href="' . admin_url('plugin-install.php') . '" title="' . esc_attr__('Go to Plugin Installer') . '" target="_parent">' . __('Go to Plugin Installer') . '</a> |
+                                <a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>
+                        ';
 
-
                 if ( ! $this->result || is_wp_error($this->result) )
                         unset( $install_actions['activate_plugin'] );