Changeset 34912 for trunk/src/wp-admin/includes/plugin.php

Timestamp:

10/07/2015 05:11:01 PM (11 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (6 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -463 +463 @@
                 return false;
 
-        $plugins = get_network_option( 'active_sitewide_plugins' );
+        $plugins = get_site_option( 'active_sitewide_plugins');
         if ( isset($plugins[$plugin]) )
                 return true;
@@ -521 +521 @@
         if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
                 $network_wide = true;
-                $current = get_network_option( 'active_sitewide_plugins', array() );
+                $current = get_site_option( 'active_sitewide_plugins', array() );
                 $_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
         } else {
@@ -574 +574 @@
 
                 if ( $network_wide ) {
-                        $current = get_network_option( 'active_sitewide_plugins', array() );
+                        $current = get_site_option( 'active_sitewide_plugins', array() );
                         $current[$plugin] = time();
-                        update_network_option( 'active_sitewide_plugins', $current );
+                        update_site_option( 'active_sitewide_plugins', $current );
                 } else {
                         $current = get_option( 'active_plugins', array() );
@@ -625 +625 @@
 function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
         if ( is_multisite() )
-                $network_current = get_network_option( 'active_sitewide_plugins', array() );
+                $network_current = get_site_option( 'active_sitewide_plugins', array() );
         $current = get_option( 'active_plugins', array() );
         $do_blog = $do_network = false;
@@ -706 +706 @@
                 update_option('active_plugins', $current);
         if ( $do_network )
-                update_network_option( 'active_sitewide_plugins', $network_current );
+                update_site_option( 'active_sitewide_plugins', $network_current );
 }
 
@@ -878 +878 @@
 
         if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-                $network_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
+                $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
                 $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
         }