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

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -2369 +2369 @@
             return false;
 
-        $failure_data = get_network_option( 'auto_core_update_failed' );
+        $failure_data = get_site_option( 'auto_core_update_failed' );
         if ( $failure_data ) {
             // If this was a critical update failure, cannot update.
@@ -2781 +2781 @@
      */
     protected function send_core_update_notification_email( $item ) {
-        $notified = get_network_option( 'auto_core_update_notified' );
+        $notified = get_site_option( 'auto_core_update_notified' );
 
         // Don't notify if we've already notified the same email address of the same version.
-        if ( $notified && $notified['email'] == get_network_option( 'admin_email' ) && $notified['version'] == $item->current )
+        if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
             return false;
 
@@ -3109 +3109 @@
                 $critical_data['rollback_data'] = $rollback_result->get_error_data();
             }
-            update_network_option( 'auto_core_update_failed', $critical_data );
+            update_site_option( 'auto_core_update_failed', $critical_data );
             $this->send_email( 'critical', $core_update, $result );
             return;
@@ -3127 +3127 @@
         $send = true;
         $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro' );
-        if ( in_array( $error_code, $transient_failures ) && ! get_network_option( 'auto_core_update_failed' ) ) {
+        if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
             wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
             $send = false;
         }
 
-        $n = get_network_option( 'auto_core_update_notified' );
+        $n = get_site_option( 'auto_core_update_notified' );
         // Don't notify if we've already notified the same email address of the same version of the same notification type.
-        if ( $n && 'fail' == $n['type'] && $n['email'] == get_network_option( 'admin_email' ) && $n['version'] == $core_update->current )
+        if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
             $send = false;
 
-        update_network_option( 'auto_core_update_failed', array(
+        update_site_option( 'auto_core_update_failed', array(
             'attempted'  => $core_update->current,
             'current'    => $wp_version,
@@ -3163 +3163 @@
      */
     protected function send_email( $type, $core_update, $result = null ) {
-        update_network_option( 'auto_core_update_notified', array(
+        update_site_option( 'auto_core_update_notified', array(
             'type'      => $type,
-            'email'     => get_network_option( 'admin_email' ),
+            'email'     => get_site_option( 'admin_email' ),
             'version'   => $core_update->current,
             'timestamp' => time(),
@@ -3321 +3321 @@
         }
 
-        $to  = get_network_option( 'admin_email' );
+        $to  = get_site_option( 'admin_email' );
         $headers = '';
 
@@ -3495 +3495 @@
 
         $email = array(
-            'to'      => get_network_option( 'admin_email' ),
+            'to'      => get_site_option( 'admin_email' ),
             'subject' => $subject,
             'body'    => implode( "\n", $body ),