Changeset 25763 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

10/11/2013 04:05:13 PM (13 years ago)

Author:

nacin

Message:

Refine error codes throughout the upgrader so we can better detect at what stage updates fail.

see #22704.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (4 diffs)

trunk/src/wp-admin/includes/update-core.php

@@ -662 +662 @@
         if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
                  $wp_filesystem->delete( $from, true );
-                 return new WP_Error( 'copy_failed', __('Could not copy file.') );
+                 return new WP_Error( 'copy_failed_for_version_file', __( 'Could not copy file.' ) );
         }
 
@@ -742 +742 @@
 
                 // If we don't have enough free space, it isn't worth trying again
-                if ( $total_size >= disk_free_space( ABSPATH ) )
+                if ( $total_size >= disk_free_space( ABSPATH ) ) {
                         $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ), $to );
-                else
+                } else {
                         $result = _copy_dir( $from . $distro, $to, $skip );
+                        if ( is_wp_error( $result ) )
+                                $result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), $result->get_error_data() );
+                }
         }
 
@@ -801 +804 @@
 
                                         if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
-                                                $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename);
+                                                $result = new WP_Error( 'copy_failed_for_new_bundled', __( 'Could not copy file.' ), $dest . $filename );
                                 } else {
                                         if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
@@ -888 +891 @@
                                 $wp_filesystem->chmod($to . $filename, 0644);
                                 if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-                                        return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
+                                        return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
                         }
                 } elseif ( 'd' == $fileinfo['type'] ) {
                         if ( !$wp_filesystem->is_dir($to . $filename) ) {
                                 if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-                                        return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
+                                        return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
                         }