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

Timestamp:

10/14/2013 07:37:53 PM (12 years ago)

Author:

nacin

Message:

More specific error codes in the core upgrader when copying language, plugin, and theme files. see #22704.

File:

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

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

@@ -766 +766 @@
         if ( @is_dir($lang_dir) ) {
             $wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
-            if ( $wp_lang_dir )
+            if ( $wp_lang_dir ) {
                 $result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
+                if ( is_wp_error( $result ) )
+                    $result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), $result->get_error_data() );
+            }
         }
     }
@@ -804 +807 @@
 
                     if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
-                        $result = new WP_Error( 'copy_failed_for_new_bundled', __( 'Could not copy file.' ), $dest . $filename );
+                        $result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
                 } else {
                     if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
@@ -811 +814 @@
                     $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
                     $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
-                    if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.
-                        $result = $_result;
+
+                    // If a error occurs partway through this final step, keep the error flowing through, but keep process going.
+                    if ( is_wp_error( $_result ) ) {
+                        if ( ! is_wp_error( $result ) )
+                            $result = new WP_Error;
+                        $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), $_result->get_error_data() );
+                    }
                 }
             }