sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Plugins: after [35151], set default $restrict_network_* values to prevent notices.

Browse Source 
Props johnjamesjacoby.
Fixes #20104.


git-svn-id: https://develop.svn.wordpress.org/trunk@35361 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-10-22 19:55:30 +00:00
parent 9aba8ef2aa
commit c6354d6bfd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-admin/includes/class-wp-plugins-list-table.php
View File

@ -503,6 +503,10 @@ class WP_Plugins_List_Table extends WP_List_Table {
'delete' => '',
);
// Do not restrict by default
$restrict_network_active = false;
$restrict_network_only = false;
if ( 'mustuse' === $context ) {
$is_active = true;
} elseif ( 'dropins' === $context ) {
@ -525,8 +529,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
} else {
if ( $screen->in_admin( 'network' ) ) {
$is_active = is_plugin_active_for_network( $plugin_file );
$restrict_network_active = false;
$restrict_network_only = false;
} else {
$is_active = is_plugin_active( $plugin_file );
$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );