Changeset 20525 for trunk/wp-admin/plugin-editor.php

Timestamp:

04/19/2012 03:41:29 AM (14 years ago)

Author:

nacin

Message:

Clean up plugins.php with regards to recently edited files, deactivations, and the network admin. see #20468, #20104.

• Limit recently_activated to the site dashboard, and properly remove bulk-activated plugins from the array.
• Remove code used from before the network admin, such as the unused 'network' plugin_status.
• Don't try to deactivate a plugin already deactivated.
• Use more specific caps (manage_network_plugins) rather than is_super_admin().

File:

• trunk/wp-admin/plugin-editor.php (modified) (1 diff)

trunk/wp-admin/plugin-editor.php

@@ -66 +66 @@
                 deactivate_plugins($file, true);
 
-            update_option('recently_activated', array($file => time()) + (array)get_option('recently_activated'));
+            if ( ! is_network_admin() )
+                update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
 
             wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));