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

Timestamp:

11/19/2014 05:39:52 AM (11 years ago)

Author:

dd32

Message:

Background Updates: Introduce support to take advantage of Group Writable (or World Writable) to Core Background updates.
This is only enabled when new files will not be installed during the update (as indicated by the WordPress.org API), and does not apply to Plugin/Theme/Translation Background Updates.

Additionally, the code to determine if the 'direct' filesystem transport should be used has been tweaked for wider support (where getmyuid() was unavailalbe) which fixes #10424

See #10205, #30245

File:

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

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

@@ -62 +62 @@
     }
 
-    public function fs_connect( $directories = array() ) {
+    public function fs_connect( $directories = array(), $allow_relaxed_file_ownership = false ) {
         global $wp_filesystem;
 
-        if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
+        if ( false === ( $credentials = $this->skin->request_filesystem_credentials( false, $directories[0], $allow_relaxed_file_ownership ) ) ) {
             return false;
-
-        if ( ! WP_Filesystem($credentials) ) {
+        }
+
+        if ( ! WP_Filesystem( $credentials, $directories[0], $allow_relaxed_file_ownership ) ) {
             $error = true;
             if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
                 $error = $wp_filesystem->errors;
-            $this->skin->request_filesystem_credentials($error); //Failed to connect, Error and request again
+            // Failed to connect, Error and request again
+            $this->skin->request_filesystem_credentials( $error, $directories[0], $allow_relaxed_file_ownership );
             return false;
         }
@@ -1457 +1459 @@
             'attempt_rollback' => false,
             'do_rollback'      => false,
+            'allow_relaxed_file_ownership' => false,
         );
         $parsed_args = wp_parse_args( $args, $defaults );
@@ -1467 +1470 @@
             return new WP_Error('up_to_date', $this->strings['up_to_date']);
 
-        $res = $this->fs_connect( array(ABSPATH, WP_CONTENT_DIR) );
+        $res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
         if ( ! $res || is_wp_error( $res ) ) {
             return $res;
@@ -1912 +1915 @@
             return false;
 
+        // Only relax the filesystem checks when the update doesn't include new files
+        $allow_relaxed_file_ownership = false;
+        if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+            $allow_relaxed_file_ownership = true;
+        }
+
         // 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 ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
             if ( 'core' == $type )
                 $this->send_core_update_notification_email( $item );
@@ -2073 +2082 @@
         }
 
+        $allow_relaxed_file_ownership = false;
+        if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+            $allow_relaxed_file_ownership = true;
+        }
+
         // Boom, This sites about to get a whole new splash of paint!
         $upgrade_result = $upgrader->upgrade( $upgrader_item, array(
@@ -2080 +2094 @@
             // Only available for core updates.
             'attempt_rollback'   => true,
+            // Allow relaxed file ownership in some scenarios
+            'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
+            
         ) );