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

Timestamp:

10/11/2013 04:05:13 PM (7 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/file.php (modified) (8 diffs)

trunk/src/wp-admin/includes/file.php

@@ -604 +604 @@
     for ( $i = 0; $i < $z->numFiles; $i++ ) {
         if ( ! $info = $z->statIndex($i) )
-            return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
+            return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 
         if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
@@ -634 +634 @@
     foreach ( $needed_dirs as $_dir ) {
         if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
-            return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
+            return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), $_dir );
     }
     unset($needed_dirs);
@@ -640 +640 @@
     for ( $i = 0; $i < $z->numFiles; $i++ ) {
         if ( ! $info = $z->statIndex($i) )
-            return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
+            return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 
         if ( '/' == substr($info['name'], -1) ) // directory
@@ -650 +650 @@
         $contents = $z->getFromIndex($i);
         if ( false === $contents )
-            return new WP_Error('extract_failed', __('Could not extract file from archive.'), $info['name']);
+            return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
 
         if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-            return new WP_Error('copy_failed', __('Could not copy file.'), $to . $info['name']);
+            return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $to . $info['name'] );
     }
 
@@ -692 +692 @@
 
     if ( 0 == count($archive_files) )
-        return new WP_Error('empty_archive', __('Empty archive.'));
+        return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
 
     // Determine any children directories needed (From within the archive)
@@ -721 +721 @@
     foreach ( $needed_dirs as $_dir ) {
         if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the dir exists upon creation failure. Less I/O this way.
-            return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
+            return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), $_dir );
     }
     unset($needed_dirs);
@@ -734 +734 @@
 
         if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-            return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
+            return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $to . $file['filename'] );
     }
     return true;
@@ -767 +767 @@
                 $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 );
             }