From 678982ee7e012fb96a35587201c2ffb43f943319 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sun, 22 Feb 2015 21:30:25 +0000 Subject: [PATCH] Do not activate plugins on initial installation in multisite. Check `is_multisite()` before activating a plugin that has been installed via AJAX. Without this check, the plugin would be automatically activated on the main site of the network. Props ianmjones. Fixes #31327. Built from https://develop.svn.wordpress.org/trunk@31511 git-svn-id: http://core.svn.wordpress.org/trunk@31492 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 5 ++++- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 59c1736ef1..8aca23eccd 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -2904,7 +2904,10 @@ function wp_ajax_install_plugin() { } $plugin_status = install_plugin_install_status( $api ); - activate_plugin( $plugin_status['file'] ); + + if ( ! is_multisite() ) { + activate_plugin( $plugin_status['file'] ); + } wp_send_json_success( $status ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 4ba4c54f7b..4efd3bbd2f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31510'; +$wp_version = '4.2-alpha-31511'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.