IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests 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.

Built from https://develop.svn.wordpress.org/trunk@34912


git-svn-id: http://core.svn.wordpress.org/trunk@34877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt
2015-10-07 17:11:25 +00:00
parent feb2267a13
commit 9926983b66
36 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/update.php
+6 -6
View File
@@ -29,7 +29,7 @@ function get_preferred_from_update_core() {
*/
function get_core_updates( $options = array() ) {
$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
$dismissed = get_network_option( 'dismissed_update_core' );
$dismissed = get_site_option( 'dismissed_update_core' );
if ( ! is_array( $dismissed ) )
$dismissed = array();
@@ -134,9 +134,9 @@ function get_core_checksums( $version, $locale ) {
* @return bool
*/
function dismiss_core_update( $update ) {
$dismissed = get_network_option( 'dismissed_update_core' );
$dismissed = get_site_option( 'dismissed_update_core' );
$dismissed[ $update->current . '|' . $update->locale ] = true;
return update_network_option( 'dismissed_update_core', $dismissed );
return update_site_option( 'dismissed_update_core', $dismissed );
}
/**
@@ -146,14 +146,14 @@ function dismiss_core_update( $update ) {
* @return bool
*/
function undismiss_core_update( $version, $locale ) {
$dismissed = get_network_option( 'dismissed_update_core' );
$dismissed = get_site_option( 'dismissed_update_core' );
$key = $version . '|' . $locale;
if ( ! isset( $dismissed[$key] ) )
return false;
unset( $dismissed[$key] );
return update_network_option( 'dismissed_update_core', $dismissed );
return update_site_option( 'dismissed_update_core', $dismissed );
}
/**
@@ -478,7 +478,7 @@ function maintenance_nag() {
global $upgrading;
$nag = isset( $upgrading );
if ( ! $nag ) {
$failed = get_network_option( 'auto_core_update_failed' );
$failed = get_site_option( 'auto_core_update_failed' );
/*
* If an update failed critically, we may have copied over version.php but not other files.
* In that case, if the install claims we're running the version we attempted, nag.