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

Timestamp:

10/11/2013 04:05:13 PM (12 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/class-wp-upgrader.php (modified) (7 diffs)

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

@@ -214 +214 @@
             $source = trailingslashit($source) . trailingslashit($source_files[0]);
         elseif ( count($source_files) == 0 )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $this->strings['no_files'] ); //There are no files?
+            return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] ); // There are no files?
         else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
             $source = trailingslashit($source);
@@ -263 +263 @@
         if ( !$wp_filesystem->exists($remote_destination) )
             if ( !$wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR) )
-                return new WP_Error('mkdir_failed', $this->strings['mkdir_failed'], $remote_destination);
+                return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
 
         // Copy new version of item into place.
@@ -624 +624 @@
 
         if ( ! $plugins_found )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('No valid plugins were found.') );
+            return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
 
         return $source;
@@ -990 +990 @@
         // A proper archive should have a style.css file in the single subdirectory
         if ( ! file_exists( $working_directory . 'style.css' ) )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>style.css</code> stylesheet.') );
+            return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'], __( 'The theme is missing the <code>style.css</code> stylesheet.' ) );
 
         $info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
 
         if ( empty( $info['Name'] ) )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __("The <code>style.css</code> stylesheet doesn't contain a valid theme header.") );
+            return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'], __( "The <code>style.css</code> stylesheet doesn't contain a valid theme header." ) );
 
         // If it's not a child theme, it must have at least an index.php to be legit.
         if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>index.php</code> file.') );
+            return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'], __( 'The theme is missing the <code>index.php</code> file.' ) );
 
         return $source;
@@ -1142 +1142 @@
         if ( ! $wp_filesystem->exists( $remote_destination ) )
             if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
-                return new WP_Error( 'mkdir_failed', $this->strings['mkdir_failed'], $remote_destination );
+                return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination );
 
         foreach ( $language_updates as $language_update ) {
@@ -1201 +1201 @@
 
         if ( ! $mo || ! $po )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'],
+            return new WP_Error( 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
                 __( 'The language pack is missing either the <code>.po</code> or <code>.mo</code> files.' ) );
 
@@ -1288 +1288 @@
         if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
             $wp_filesystem->delete($working_dir, true);
-            return new WP_Error('copy_failed', $this->strings['copy_failed']);
+            return new WP_Error( 'copy_failed_for_update_core_file', $this->strings['copy_failed'] );
         }
         $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);