Changeset 35361

Timestamp:

10/22/2015 07:55:30 PM (10 years ago)

Author:

wonderboymusic

Message:

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

Props johnjamesjacoby.
Fixes #20104.

File:

• trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -504 +504 @@
         );
 
+        // Do not restrict by default
+        $restrict_network_active = false;
+        $restrict_network_only = false;
+
         if ( 'mustuse' === $context ) {
             $is_active = true;
@@ -526 +530 @@
             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 );