Ticket #27196: 27196.3.diff

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

@@ -51 +51 @@
                 $this->strings['download_failed'] = __('Download failed.');
                 $this->strings['installing_package'] = __('Installing the latest version…');
                 $this->strings['no_files'] = __('The package contains no files.');
-                $this->strings['folder_exists'] = __('Destination folder already exists.');
+                $this->strings['folder_exists'] = __('Plugin folder already exists.');
+                $this->strings['remove_first'] = __( 'Please either delete the existing plugin before uploading a new version or use the Updates page to update this plugin.' );
                 $this->strings['mkdir_failed'] = __('Could not create directory.');
                 $this->strings['incompatible_archive'] = __('The package could not be installed.');
 
@@ -406 +407 @@
                 $this->skin->set_result($result);
                 if ( is_wp_error($result) ) {
                         $this->skin->error($result);
+                        if ( in_array( 'folder_exists', $result->get_error_codes() ) ){
+                                $this->skin->feedback( 'remove_first' );
+                        }
                         $this->skin->feedback('process_failed');
                 } else {
                         //Install Succeeded