Ticket #11850: plugins.diff

wp-admin/plugins.php

@@ -224 +224 @@
                                         foreach ( (array) $plugins as $plugin ) {
                                                 if ( '.' == dirname($plugin) ) {
                                                         $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
-                                                        if ( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
+                                                        if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) ) {
                                                                 $plugin_info[ $plugin ] = $data;
+                                                                $plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+                                                        }
                                                 } else {
                                                         //Locate all the files in that folder:
                                                         $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
@@ -233 +235 @@
                                                                 $files_to_delete = array_merge($files_to_delete, $files);
                                                         }
                                                         //Get plugins list from that folder
-                                                        if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) )
-                                                                $plugin_info = array_merge($plugin_info, $folder_plugins);
+                                                        if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
+                                                                foreach( $folder_plugins as $plugin_file => $data ) {
+                                                                        $plugin_info[ $plugin_file ] = $data;
+                                                                        $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+                                                                }
+                                                        }
                                                 }
                                         }
                                 ?>
                                 <p><?php _e('Deleting the selected plugins will remove the following plugin(s) and their files:'); ?></p>
                                         <ul class="ul-disc">
                                                 <?php
-                                                foreach ( $plugin_info as $plugin )
-                                                        /* translators: 1: plugin name, 2: plugin author */
-                                                        echo '<li>', sprintf(__('<strong>%1$s</strong> by <em>%2$s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
+                                                foreach ( $plugin_info as $plugin ) {
+                                                        if ( $plugin['is_uninstallable'] )
+                                                                /* translators: 1: plugin name, 2: plugin author */
+                                                                echo '<li>', sprintf(__('<strong>%s</strong> by <em>%s</em> (will also <strong>delete its data</strong>)'), $plugin['Name'], $plugin['Author']), '</li>'; 
+                                                        else 
+                                                                /* translators: 1: plugin name, 2: plugin author */
+                                                                echo '<li>', sprintf(__('<strong>%s</strong> by <em>%s</em>'), $plugin['Name'], $plugin['Author']), '</li>'; 
+                                                }
                                                 ?>
                                         </ul>
                                 <p><?php _e('Are you sure you wish to delete these files?') ?></p>