Changeset 34912 for trunk/src/wp-admin/includes/update.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/includes/update.php (modified) (5 diffs)

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

@@ -30 +30 @@
 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 ) )
@@ -135 +135 @@
  */
 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 );
 }
 
@@ -147 +147 @@
  */
 function undismiss_core_update( $version, $locale ) {
-    $dismissed = get_network_option( 'dismissed_update_core' );
+    $dismissed = get_site_option( 'dismissed_update_core' );
     $key = $version . '|' . $locale;
 
@@ -154 +154 @@
 
     unset( $dismissed[$key] );
-    return update_network_option( 'dismissed_update_core', $dismissed );
+    return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
@@ -479 +479 @@
     $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.