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

Timestamp:

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

Author:

nacin

Message:

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

File:

• trunk/src/wp-admin/includes/file.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;