vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-02 19:54:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wp-admin/plugins.php
View File

@@ -55,9 +55,9 @@ if ( $action ) {
unset( $recent[ $plugin ] );
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 );
}
if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
@@ -101,7 +101,7 @@ if ( $action ) {
if ( ! is_network_admin() ) {
$recent = (array) get_option('recently_activated' );
} else {
$recent = (array) get_network_option( 'recently_activated' );
$recent = (array) get_site_option('recently_activated' );
}
foreach ( $plugins as $plugin ) {
@@ -111,7 +111,7 @@ if ( $action ) {
if ( ! is_network_admin() ) {
update_option( 'recently_activated', $recent );
} else {
update_network_option( 'recently_activated', $recent );
update_site_option( 'recently_activated', $recent );
}
wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
@@ -182,7 +182,7 @@ if ( $action ) {
if ( ! is_network_admin() ) {
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' ) );
}
if ( headers_sent() )
@@ -220,7 +220,7 @@ if ( $action ) {
if ( ! is_network_admin() ) {
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' ) );
}
wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
@@ -382,7 +382,7 @@ if ( $action ) {
if ( ! is_network_admin() ) {
update_option( 'recently_activated', array() );
} else {
update_network_option( 'recently_activated', array() );
update_site_option( 'recently_activated', array() );
}
break;
}