Changeset 19246

Timestamp:

11/10/2011 07:41:44 PM (13 years ago)

Author:

ryan

Message:

More specific error strings for failed theme and plugin package uploads. Props dd32. fixes #14999

File:

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

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

@@ -53 +53 @@
         $this->strings['folder_exists'] = __('Destination folder already exists.');
         $this->strings['mkdir_failed'] = __('Could not create directory.');
-        $this->strings['incompatible_archive'] = __('The package is corrupt or not in the correct format.');
+        $this->strings['incompatible_archive'] = __('The package could not be installed.');
 
         $this->strings['maintenance_start'] = __('Enabling Maintenance mode…');
@@ -194 +194 @@
             $source = trailingslashit($source) . trailingslashit($source_files[0]);
         elseif ( count($source_files) == 0 )
-            return new WP_Error('incompatible_archive', $this->strings['incompatible_archive']); //There are no files?
+            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The plugin contains no files.' ) ); //There are no files?
         else //Its 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);
@@ -563 +563 @@
 
         if ( ! $plugins_found )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'] );
+            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('No valid plugins were found.') );
 
         return $source;
@@ -837 +837 @@
 
         if ( ! file_exists( $working_directory . 'style.css' ) ) // A proper archive should have a style.css file in the single subdirectory
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'] );
+            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>style.css</code> stylesheet.') );
 
         $info = get_theme_data( $working_directory . 'style.css' );
         if ( empty($info['Name']) )
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'] );
+            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __("The <code>style.css</code> stylesheet doesn't contain a valid theme header.") );
 
         if ( empty($info['Template']) && ! file_exists( $working_directory . 'index.php' ) ) // If no template is set, it must have at least an index.php to be legit.
-            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'] );
+            return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>index.php</code> file.') );
 
         return $source;