Changeset 25467

Timestamp:

09/17/2013 02:27:21 AM (13 years ago)

Author:

dd32

Message:

WordPress Core Automatic Updates: Switch from using a transient for locking the upgrade process, to using a site option. See #22704

File:

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

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

@@ -1449 +1449 @@
 
                 $lock_name = 'auto_upgrader.lock';
-                if ( get_site_transient( $lock_name ) ) {
+                if ( get_site_option( $lock_name ) ) {
                         // Test to see if it was set more than an hour ago, if so, cleanup.
-                        if ( true || get_site_transient( $lock_name ) < ( time() - HOUR_IN_SECONDS ) )
-                                delete_site_transient( $lock_name );
-                        else // Recent lock
+                        if ( get_site_option( $lock_name ) < ( time() - HOUR_IN_SECONDS ) )
+                                delete_site_option( $lock_name );
+                        else { // The process is already locked
+                                echo "There's a lock in place";
                                 return;
+                        }
                 }
                 // Lock upgrades for us for half an hour
-                if ( ! set_site_transient( $lock_name, microtime( true ), HOUR_IN_SECONDS / 2 ) )
+                if ( ! add_site_option( $lock_name, microtime( true ), HOUR_IN_SECONDS / 2 ) )
                         return;
 
@@ -1493 +1495 @@
                 wp_update_plugins(); // Check for Plugin updates
 
-                // TODO The core database upgrade has already cleared this transient..
-                delete_site_transient( $lock_name );
+                // Clear the lock
+                delete_site_option( $lock_name );
 
         }