Changeset 25872

Timestamp:

10/22/2013 09:14:06 PM (13 years ago)

Author:

nacin

Message:

Show the nag we show for a stuck .maintenance file when an auto update failed.

see #25654.

File:

• trunk/src/wp-admin/includes/update.php (modified) (2 diffs)

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

@@ -345 +345 @@
 
 function maintenance_nag() {
+        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
         global $upgrading;
-        if ( ! isset( $upgrading ) )
+        $nag = isset( $upgrading );
+        if ( ! $nag ) {
+                $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.
+                 * This is serious enough to err on the side of nagging.
+                 *
+                 * If we simply failed to update before we tried to copy any files, then assume things are
+                 * OK if they are now running the latest.
+                 *
+                 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
+                 */
+                $comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
+                if ( version_compare( $failed['attempted'], $wp_version, '>=' ) )
+                        $nag = true;
+        }
+
+        if ( ! $nag )
                 return false;
 
@@ -357 +376 @@
 }
 add_action( 'admin_notices', 'maintenance_nag' );
+add_action( 'network_admin_notices', 'maintenance_nag' );