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

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

Browse Source 
Props johnjamesjacoby.
Fixes #20104.

Built from https://develop.svn.wordpress.org/trunk@35361


git-svn-id: http://core.svn.wordpress.org/trunk@35327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-22 19:56:23 +00:00
parent e31c837d70
commit 2afbf378d9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35360'; $wp_version = '4.4-alpha-35361';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.