Changes from trunk/wp-admin/includes/file.php at r22800 to branches/3.5/wp-admin/includes/file.php at r24481

File:

• branches/3.5/wp-admin/includes/file.php (modified) (3 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 ) );
     }
 
@@ -488 +498 @@
         return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-    $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+    $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname, 'reject_unsafe_urls' => true ) );
 
     if ( is_wp_error( $response ) ) {