Changeset 34912 for trunk/src/wp-admin/plugins.php

Timestamp:

10/07/2015 05:11:01 PM (9 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/plugins.php (modified) (6 diffs)

trunk/src/wp-admin/plugins.php

@@ -56 +56 @@
                 update_option( 'recently_activated', $recent );
             } else {
-                $recent = (array) get_network_option( 'recently_activated' );
+                $recent = (array) get_site_option( 'recently_activated' );
                 unset( $recent[ $plugin ] );
-                update_network_option( 'recently_activated', $recent );
+                update_site_option( 'recently_activated', $recent );
             }
 
@@ -102 +102 @@
                 $recent = (array) get_option('recently_activated' );
             } else {
-                $recent = (array) get_network_option( 'recently_activated' );
+                $recent = (array) get_site_option('recently_activated' );
             }
 
@@ -112 +112 @@
                 update_option( 'recently_activated', $recent );
             } else {
-                update_network_option( 'recently_activated', $recent );
+                update_site_option( 'recently_activated', $recent );
             }
 
@@ -183 +183 @@
                 update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
             } else {
-                update_network_option( 'recently_activated', array( $plugin => time() ) + (array) get_network_option( 'recently_activated' ) );
+                update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
             }
 
@@ -221 +221 @@
                 update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
             } else {
-                update_network_option( 'recently_activated', $deactivated + (array) get_network_option( 'recently_activated' ) );
+                update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
             }
 
@@ -383 +383 @@
                 update_option( 'recently_activated', array() );
             } else {
-                update_network_option( 'recently_activated', array() );
+                update_site_option( 'recently_activated', array() );
             }
             break;