Changeset 24464 for branches/3.5/wp-admin/includes/file.php

Timestamp:

06/21/2013 02:31:39 AM (12 years ago)

Author:

nacin

Message:

Show a relative path in an upload error message.

Merges [24463] to the 3.5 branch.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-admin/includes/file.php (modified) (2 diffs)

branches/3.5/wp-admin/includes/file.php

@@ -329 +329 @@
     // Move the file to the uploads dir
     $new_file = $uploads['path'] . "/$filename";
-    if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) )
-        return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) );
+    if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) {
+        if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
+            $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+        else
+            $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+
+        return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+    }
 
     // Set correct file permissions
@@ -453 +459 @@
     $new_file = $uploads['path'] . "/$filename";
     if ( false === @ rename( $file['tmp_name'], $new_file ) ) {
-        return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) );
+        if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
+            $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+        else
+            $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+        return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
     }