IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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().



git-svn-id: http://svn.automattic.com/wordpress/trunk@20525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
2012-04-19 03:41:29 +00:00
parent abd8d6a4c2
commit c23bf21079
4 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/includes/plugin.php
View File

@@ -572,9 +572,11 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
* @since 2.5.0
*
* @param string|array $plugins Single plugin or list of plugins to deactivate.
* @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
* A value of null (the default) will deactivate plugins for both the site and the network.
* @param bool $silent Prevent calling deactivation hooks. Default is false.
*/
function deactivate_plugins( $plugins, $silent = false ) {
function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
if ( is_multisite() )
$network_current = get_site_option( 'active_sitewide_plugins', array() );
$current = get_option( 'active_plugins', array() );
@@ -585,15 +587,19 @@ function deactivate_plugins( $plugins, $silent = false ) {
if ( ! is_plugin_active($plugin) )
continue;
$network_wide = is_plugin_active_for_network( $plugin );
$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
if ( ! $silent )
do_action( 'deactivate_plugin', $plugin, $network_wide );
do_action( 'deactivate_plugin', $plugin, $network_deactivating );
if ( $network_wide ) {
if ( false !== $network_wide ) {
if ( ! is_plugin_active_for_network( $plugin ) )
continue;
$do_network = true;
unset( $network_current[ $plugin ] );
} else {
}
if ( true !== $network_wide ) {
$key = array_search( $plugin, $current );
if ( false !== $key ) {
$do_blog = true;
@@ -602,8 +608,8 @@ function deactivate_plugins( $plugins, $silent = false ) {
}
if ( ! $silent ) {
do_action( 'deactivate_' . $plugin, $network_wide );
do_action( 'deactivated_plugin', $plugin, $network_wide );
do_action( 'deactivate_' . $plugin, $network_deactivating );
do_action( 'deactivated_plugin', $plugin, $network_deactivating );
}
}