From 2afbf378d9e315692113c47109aad22f999c61fe Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 22 Oct 2015 19:56:23 +0000
Subject: [PATCH] Plugins: after [35151], set default `$restrict_network_*`
 values to prevent notices.

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
---
 wp-admin/includes/class-wp-plugins-list-table.php | 6 ++++--
 wp-includes/version.php                           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 3a51d177f7..43dcc6ea5a 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -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 ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c01afb5f12..60cf1fbc0c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.