Changeset 25873

Timestamp:

10/22/2013 09:18:09 PM (11 years ago)

Author:

nacin

Message:

Make some changes to the email templates to account for the fact that an auto update offer might not be to the latest version.

For example, 3.7.2 install is served a 3.7.3 update, but the current version is 3.8.1.

This commit also allows for core update notification emails to be sent even when we are unable to run an auto update due to filesystem configuration (VCS checkout or file permissions). But, since these emails go through WP_Automatic_Updater, they will not be sent if the updater is outright disabled.

fixes #25654.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (13 diffs)
• wp-includes/update.php (modified) (1 diff)

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

@@ -1653 +1653 @@
          * This filter parallels the AUTOMATIC_UPDATER_DISABLED constant in name.
          *
+         * This also disables update notification emails. That may change in the future.
+         *
          * @since 3.7.0
          * @param bool $disabled Whether the updater should be disabled.
@@ -1729 +1731 @@
      */
     public function should_update( $type, $item, $context ) {
+        // Used to see if WP_Filesystem is set up to allow unattended updates.
+        $skin = new Automatic_Upgrader_Skin;
+
         if ( $this->is_disabled() )
             return false;
 
-        // Checks to see if WP_Filesystem is set up to allow unattended updates.
-        $skin = new Automatic_Upgrader_Skin;
-        if ( ! $skin->request_filesystem_credentials( false, $context ) )
+        // If we can't do an auto core update, we may still be able to email the user.
+        if ( ! $skin->request_filesystem_credentials( false, $context ) || $this->is_vcs_checkout( $context ) ) {
+            if ( 'core' == $type )
+                $this->notify_core_update( $item );
             return false;
-
-        if ( $this->is_vcs_checkout( $context ) )
-            return false;
+        }
 
         // Next up, is this an item we can update?
@@ -1766 +1770 @@
 
         if ( ! $update ) {
-
-            // See if we need to notify users of a core update.
-            if ( 'core' == $type && ! empty( $item->notify_email ) ) {
-                $notify      = true;
-                $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_site_option( 'admin_email' ) && $notified['version'] == $item->current )
-                    return false;
-
-                $this->send_email( 'manual', $item );
-            }
-
+            if ( 'core' == $type )
+                $this->notify_core_update( $item );
             return false;
         }
@@ -1796 +1789 @@
         }
 
+        return true;
+    }
+
+    /**
+     * Notifies an administrator of a core update.
+     *
+     * @since 3.7.0
+     *
+     * @param object $item The update offer.
+     */
+    protected function notify_core_update( $item ) {
+        // See if we need to notify users of a core update.
+        if ( empty( $item->notify_email ) )
+            return false;
+
+        $notify   = true;
+        $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_site_option( 'admin_email' ) && $notified['version'] == $item->current )
+            return false;
+
+        $this->send_email( 'manual', $item );
         return true;
     }
@@ -1891 +1907 @@
         global $wpdb, $wp_version;
 
+        if ( $this->is_disabled() )
+            return;
+
         if ( ! is_main_network() || ! is_main_site() )
             return;
@@ -2083 +2102 @@
      * @since 3.7.0
      *
-     * @param string $type        The type of update being checked: 'core', 'theme', 'plugin', 'translation'.
+     * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
      * @param object $core_update The update offer that was attempted.
      * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
@@ -2095 +2114 @@
         ) );
 
+        $next_user_core_update = get_preferred_from_update_core();
+        // If the update transient is empty, use the update we just performed
+        if ( ! $next_user_core_update )
+            $next_user_core_update = $core_update;
+        $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update, '>' ) );
+
+        $newer_version_available = true;
+        $next_user_core_update->version = $next_user_core_update->current = '3.8.1';
         /**
          * Filter whether to send an email following an automatic background core update.
@@ -2129 +2156 @@
         }
 
-        $subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $core_update->current );
+        // If the auto update is not to the latest version, say that the current version of WP is available instead.
+        $version = 'success' === $type ? $core_update->current : $next_user_core_update->current;
+        $subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $version );
 
         $body = '';
@@ -2136 +2165 @@
             case 'success' :
                 $body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
-                $body .= "\n\n" . __( 'No further action is needed on your part.' );
+                $body .= "\n\n";
+                if ( ! $newer_version_available )
+                    $body .= __( 'No further action is needed on your part.' ) . ' ';
 
                 // Can only reference the About screen if their update was successful.
                 list( $about_version ) = explode( '-', $core_update->current, 2 );
-                $body .= ' ' . sprintf( __( "For more on version %s, see the About WordPress screen:" ), $about_version );
+                $body .= sprintf( __( "For more on version %s, see the About WordPress screen:" ), $about_version );
                 $body .= "\n" . admin_url( 'about.php' );
+
+                if ( $newer_version_available ) {
+                    $body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
+                    $body .= __( 'Updating is easy and only takes a few moments:' );
+                    $body .= "\n" . network_admin_url( 'update-core.php' );
+                }
+
                 break;
 
             case 'fail' :
             case 'manual' :
-                $body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $core_update->current );
+                $body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
 
                 $body .= "\n\n";
-                if ( 'fail' == $type )
+
+                // Don't show this message if there is a newer version available.
+                // Potential for confusion, and also not useful for them to know at this point.
+                if ( 'fail' == $type && ! $newer_version_available )
                     $body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
+
                 $body .= __( 'Updating is easy and only takes a few moments:' );
                 $body .= "\n" . network_admin_url( 'update-core.php' );
@@ -2156 +2198 @@
 
             case 'critical' :
-                $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
+                if ( $newer_version_available )
+                    $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
+                else
+                    $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
 
                 $body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
@@ -2166 +2211 @@
 
         // Updates are important!
-        if ( $type != 'success' )
+        if ( $type != 'success' || $newer_version_available )
             $body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
 
@@ -2173 +2218 @@
         $body .= "\n" . __( 'http://wordpress.org/support/' );
 
-        // If things are successful, mention plugins and themes if any are out of date.
-        if ( $type == 'success' && ( get_plugin_updates() || get_theme_updates() ) ) {
+        // If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
+        if ( $type == 'success' && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
             $body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
             $body .= "\n" . network_admin_url();
@@ -2183 +2228 @@
         if ( 'critical' == $type && is_wp_error( $result ) ) {
             $body .= "\n***\n\n";
-            $body .= __( 'We have some data that describes the error your site encountered.' );
+            $body .= sprintf( __( 'Your site was running version %s.' ), $GLOBALS['wp_version'] );
+            $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
             $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
 

trunk/src/wp-includes/update.php

@@ -416 +416 @@
 
     $upgrader = new WP_Automatic_Updater;
-    if ( $upgrader->is_disabled() )
-        return;
-
     $upgrader->run();
 }