Ticket #38918: 38918-forced-test.diff

wp-admin/includes/plugin.php

@@ -869 +869 @@
                         continue;
                 }
 
+                $fake_errors = array();
+
+                if( $deleted ) {
+                        $fake_errors[] = $plugin_file;
+                }
+
                 // Remove language files, silently.
                 $plugin_slug = dirname( $plugin_file );
                 if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
@@ -893 +899 @@
                 set_site_transient( 'update_plugins', $current );
         }
 
-        if ( ! empty($errors) )
-                return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+        if ( ! empty( $errors ) )
+                return new WP_Error('could_not_remove_plugin', sprintf( __( 'Could not fully remove the plugin: %s.' ), implode( ', ', $errors ) ) );
 
+        if( ! empty( $fake_errors ) )
+                return new WP_Error('could_not_remove_plugin', sprintf( __( 'Could not fully remove the plugin: %s.' ), implode( ', ', $fake_errors ) ) );
+
         return true;
 }