Ticket #18200: 18200.3.diff

src/wp-admin/includes/plugin.php

@@ -787 +787 @@
 
         $errors = array();
 
+        $translation_data = wp_get_installed_translations();
         foreach( $plugins as $plugin_file ) {
                 // Run Uninstall hook
                 if ( is_uninstallable_plugin( $plugin_file ) )
@@ -794 +795 @@
 
                 $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) );
                 // If plugin is in its own directory, recursively delete the directory.
-                if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
+                // Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+                if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) {
                         $deleted = $wp_filesystem->delete($this_plugin_dir, true);
-                else
+
+                        // Remove any translation files.
+                        $slug = basename( $this_plugin_dir );
+                        if ( isset( $translation_data[ $slug ] ) ) {
+                                if ( ! isset( $lang_dir ) )
+                                        $lang_dir = $wp_filesystem->wp_lang_dir();
+                                if ( $lang_dir ) {
+                                        foreach ( $translation_data[ $slug ] as $language => $po_file_data ) {
+                                                $wp_filesystem->delete( trailingslashit( $lang_dir ) . "plugins/$slug-$language.po" );
+                                                $wp_filesystem->delete( trailingslashit( $lang_dir ) . "plugins/$slug-$language.mo" );
+                                        }
+                                }
+                        }
+                } else {
                         $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);
+                }
 
                 if ( ! $deleted )
                         $errors[] = $plugin_file;