Ticket #30245: 30245.stats.diff

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

@@ -2064 +2142 @@
                         }
                 }
 
                 /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
                 do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) );
 
                 // Clear the current updates
                 delete_site_transient( 'update_core' );
 
                 if ( ! $parsed_args['do_rollback'] ) {
                         $stats = array(
                                 'update_type'      => $current->response,
                                 'success'          => true,
                                 'fs_method'        => $wp_filesystem->method,
                                 'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
+                                'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
                                 'time_taken'       => time() - $start_time,
                                 'reported'         => $wp_version,
                                 'attempted'        => $current->version,
                         );
 
                         if ( is_wp_error( $result ) ) {
                                 $stats['success'] = false;
                                 // Did a rollback occur?
                                 if ( ! empty( $try_rollback ) ) {
                                         $stats['error_code'] = $original_result->get_error_code();
                                         $stats['error_data'] = $original_result->get_error_data();
                                         // Was the rollback successful? If not, collect its error too.
                                         $stats['rollback'] = ! is_wp_error( $rollback_result );
                                         if ( is_wp_error( $rollback_result ) ) {
                                                 $stats['rollback_code'] = $rollback_result->get_error_code();

src/wp-admin/includes/file.php

@@ -916 +916 @@
                 $temp_file_name = $context . 'temp-write-test-' . time();
                 $temp_handle = @fopen($temp_file_name, 'w');
                 if ( $temp_handle ) {
 
                         // Attempt to determine the file owner of the WordPress files, and that of newly created files
                         $wp_file_owner = $temp_file_owner = false;
                         if ( function_exists('fileowner') ) {
                                 $wp_file_owner = @fileowner( __FILE__ );
                                 $temp_file_owner = @fileowner( $temp_file_name );
                         }
 
                         if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
                                 // WordPress is creating files as the same owner as the WordPress files, 
                                 // this means it's safe to modify & create new files via PHP.
                                 $method = 'direct';
+                                $GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
                         } else if ( $allow_relaxed_file_ownership ) {
                                 // The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
                                 // safely in this directory. This mode doesn't create new files, only alter existing ones.
                                 $method = 'direct';
+                                $GLOBALS['_wp_filesystem_direct_method'] = 'relaxed_ownership';
                         }
 
                         @fclose($temp_handle);
                         @unlink($temp_file_name);
                 }
         }
 
         if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
         if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
         if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
         /**
          * Filter the filesystem method to use.
          *
          * @since 2.6.0