Changeset 25780

Timestamp:

10/14/2013 10:24:28 PM (11 years ago)

Author:

nacin

Message:

Parse absolute paths out of error data. see #22704.

Location:

trunk/src/wp-admin/includes

Files:

• file.php (modified) (4 diffs)
• update-core.php (modified) (4 diffs)

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

@@ -646 +646 @@
     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_ziparchive', __( 'Could not create directory.' ), $_dir );
+            return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
     }
     unset($needed_dirs);
@@ -665 +665 @@
 
         if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-            return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $to . $info['name'] );
+            return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
     }
 
@@ -745 +745 @@
     // Create those directories if need be:
     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_pclzip', __( 'Could not create directory.' ), $_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_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
     }
     unset($needed_dirs);
@@ -759 +759 @@
 
         if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-            return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $to . $file['filename'] );
+            return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
     }
     return true;

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

@@ -717 +717 @@
     // Copy new versions of WP files into place.
     $result = _copy_dir( $from . $distro, $to, $skip );
+    if ( is_wp_error( $result ) )
+        $result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
 
     // Check to make sure everything copied correctly, ignoring the contents of wp-content
@@ -745 +747 @@
         $available_space = disk_free_space( ABSPATH );
         if ( $available_space && $total_size >= $available_space ) {
-            $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ), $to );
+            $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) );
         } 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() );
+                $result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
         }
     }
@@ -771 +773 @@
                 $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() );
+                    $result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
             }
         }
@@ -821 +823 @@
                         if ( ! is_wp_error( $result ) )
                             $result = new WP_Error;
-                        $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), $_result->get_error_data() );
+                        $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
                     }
                 }