Skip to content

Commit

Permalink
Show plugin activation message when activating a network only plugin …
Browse files Browse the repository at this point in the history
…on a single site installation. fixes #22576 for the 3.4 branch.

git-svn-id: https://develop.svn.wordpress.org/branches/3.4@22918 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
nacin committed Nov 29, 2012
1 parent 4920ad8 commit d523881
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions wp-admin/plugins.php
Expand Up @@ -37,6 +37,11 @@
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));

if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
}

check_admin_referer('activate-plugin_' . $plugin);

$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
Expand All @@ -51,11 +56,6 @@
}

if ( ! is_network_admin() ) {
if ( is_network_only_plugin( $plugin ) ) {
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
}

$recent = (array) get_option( 'recently_activated' );
unset( $recent[ $plugin ] );
update_option( 'recently_activated', $recent );
Expand Down

0 comments on commit d523881

Please sign in to comment.