Changeset 36370

Timestamp:

01/21/2016 01:21:52 AM (11 years ago)

Author:

dd32

Message:

Upgrade: Switch the locking mechanism to using static methods so that it can be accessed from other upgrade-classes.

Fixes #34878

File:

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

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

@@ -757 +757 @@
          * @since 4.5.0
          * @access public
+         * @static
          *
          * @param string $lock_name       The name of this unique lock.
@@ -762 +763 @@
          * @return bool
          */
-        public function create_lock( $lock_name, $release_timeout = null ) {
+        public static function create_lock( $lock_name, $release_timeout = null ) {
                 global $wpdb;
                 if ( ! $release_timeout ) {
@@ -786 +787 @@
 
                         // There must exist an expired lock, clear it and re-gain it.
-                        $this->release_lock( $lock_name );
-
-                        return $this->create_lock( $lock_name, $release_timeout );
+                        WP_Upgrader::release_lock( $lock_name );
+
+                        return WP_Upgrader::create_lock( $lock_name, $release_timeout );
                 }
 
@@ -802 +803 @@
          * @since 4.5.0
          * @access public
+         * @static
          *
          * @param string $lock_name The name of this unique lock.
          * @return bool
          */
-        public function release_lock( $lock_name ) {
+        public static function release_lock( $lock_name ) {
                 return delete_option( $lock_name . '.lock' );
         }
@@ -2313 +2315 @@
 
                 // Lock to prevent multiple Core Updates occuring
-                $lock = $this->create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
+                $lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
                 if ( ! $lock ) {
                         return new WP_Error( 'locked', $this->strings['locked'] );
@@ -2320 +2322 @@
                 $download = $this->download_package( $current->packages->$to_download );
                 if ( is_wp_error( $download ) ) {
-                        $this->release_lock( 'core_updater' );
+                        WP_Upgrader::release_lock( 'core_updater' );
                         return $download;
                 }
@@ -2326 +2328 @@
                 $working_dir = $this->unpack_package( $download );
                 if ( is_wp_error( $working_dir ) ) {
-                        $this->release_lock( 'core_updater' );
+                        WP_Upgrader::release_lock( 'core_updater' );
                         return $working_dir;
                 }
@@ -2333 +2335 @@
                 if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
                         $wp_filesystem->delete($working_dir, true);
-                        $this->release_lock( 'core_updater' );
+                        WP_Upgrader::release_lock( 'core_updater' );
                         return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
                 }
@@ -2341 +2343 @@
 
                 if ( ! function_exists( 'update_core' ) ) {
-                        $this->release_lock( 'core_updater' );
+                        WP_Upgrader::release_lock( 'core_updater' );
                         return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
                 }
@@ -2418 +2420 @@
                 }
 
-                $this->release_lock( 'core_updater' );
+                WP_Upgrader::release_lock( 'core_updater' );
 
                 return $result;
@@ -3055 +3057 @@
                         return;
 
-                if ( ! $this->create_lock( 'auto_updater' ) )
+                if ( ! WP_Upgrader::create_lock( 'auto_updater' ) )
                         return;
 
@@ -3155 +3157 @@
                 }
 
-                $this->release_lock( 'auto_updater' );
+                WP_Upgrader::release_lock( 'auto_updater' );
         }