Ticket #20944: 20944.patch

wp-admin/includes/plugin.php

@@ -778 +778 @@
 
         // invalid plugins get deactivated
         foreach ( $plugins as $plugin ) {
+
+                // see if the plugin file name was changed
+                if ( ! file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+                        $plugin_dir = dirname( $plugin );
+                        if ( ! empty( $plugin_dir ) ) {
+                                $renamed_plugin_data = get_plugins( '/' . $plugin_dir );
+                                if ( ! empty( $renamed_plugin_data ) ) {
+                                        $plugin_files = array_keys( $renamed_plugin_data );
+                                        $renamed_plugin = $plugin_dir . '/' . $plugin_files[0];
+                                        if ( ! is_wp_error( validate_plugin( $renamed_plugin ) ) ) {
+                                                deactivate_plugins( $plugin, true );
+                                                activate_plugin( $renamed_plugin, '', false, true );
+                                                continue;
+                                        }
+                                }
+                        }
+                }
+
                 $result = validate_plugin( $plugin );
                 if ( is_wp_error( $result ) ) {
                         $invalid[$plugin] = $result;

wp-admin/plugins.php

@@ -316 +316 @@
         }
 }
 
+$invalid = validate_active_plugins();
 $wp_list_table->prepare_items();
 
 wp_enqueue_script('plugin-install');
@@ -349 +350 @@
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-$invalid = validate_active_plugins();
 if ( !empty($invalid) )
         foreach ( $invalid as $plugin_file => $error )
                 echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>';