Changeset 25815 for trunk/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

10/16/2013 07:34:05 PM (10 years ago)

Author:

nacin

Message:

Merge the should_auto_update() and can_auto_update() methods. see #22704.

File:

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

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

@@ -1602 +1602 @@
 
     /**
-     * Tests to see if we should upgrade a specific item, does not test to see if we CAN update the item.
+     * Tests to see if we can and should upgrade a specific item.
      */
     static function should_auto_update( $type, $item, $context ) {
+
+        // Checks to see if WP_Filesystem is set up to allow unattended upgrades.
+        $skin = new Automatic_Upgrader_Skin;
+        if ( ! $skin->request_filesystem_credentials( false, $context ) )
+            return false;
 
         if ( self::upgrader_disabled() )
@@ -1632 +1637 @@
             return false;
 
-        // If it's a core update, are we actually compatible with it's requirements?
+        // If it's a core update, are we actually compatible with its requirements?
         if ( 'core' == $type ) {
             global $wpdb;
@@ -1647 +1652 @@
 
         return true;
-    }
-
-    // Checks to see if WP_Filesystem is setup to allow unattended upgrades
-    static function can_auto_update( $context, $skin = false ) {
-        if ( ! $skin )
-            $skin = new Automatic_Upgrader_Skin();
-        return (bool) $skin->request_filesystem_credentials( false, $context );
     }
 
@@ -1681 +1679 @@
         }
 
-        // Determine if we can perform this upgrade or not
-        if ( ! self::should_auto_update( $type, $item, $context ) || ! self::can_auto_update( $context, $skin ) )
+        // Determine whether we can and should perform this upgrade.
+        if ( ! self::should_auto_update( $type, $item, $context ) )
             return false;