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.


git-svn-id: https://develop.svn.wordpress.org/trunk@34912 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2015-10-07 17:11:01 +00:00
parent 9a704fa0b8
commit 599fb50e09
35 changed files with 192 additions and 192 deletions
@@ -130,7 +130,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
if ( $screen->in_admin( 'network' ) ) {
$recently_activated = get_network_option( 'recently_activated', array() );
$recently_activated = get_site_option( 'recently_activated', array() );
} else {
$recently_activated = get_option( 'recently_activated', array() );
}
@@ -142,7 +142,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
}
if ( $screen->in_admin( 'network' ) ) {
update_network_option( 'recently_activated', $recently_activated );
update_site_option( 'recently_activated', $recently_activated );
} else {
update_option( 'recently_activated', $recently_activated );
}