Changeset 22105

Timestamp:

10/03/2012 06:49:37 PM (12 years ago)

Author:

nacin

Message:

Pass the post date to wp_upload_dir() during sideloads, just as we do uploads. Ensures that sideloaded images make it into the right uploads directory.

props solarisssmoke, fixes #16777.

Location:

trunk/wp-admin/includes

Files:

• file.php (modified) (4 diffs)
• media.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -2 +2 @@
 /**
  * Functions for reading, writing, modifying, and deleting files on the file system.
- * Includes functionality for theme-specific files as well as operations for uploading, 
+ * Includes functionality for theme-specific files as well as operations for uploading,
  * archiving, and rendering output when necessary.
  *
@@ -228 +228 @@
  * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
  * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
+ * @param string $time Optional. Time formatted in 'yyyy/mm'.
  * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
@@ -360 +361 @@
  * @param array $file an array similar to that of a PHP $_FILES POST array
  * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
+ * @param string $time Optional. Time formatted in 'yyyy/mm'.
  * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_sideload( &$file, $overrides = false ) {
+function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
     // The default error handler.
     if (! function_exists( 'wp_handle_upload_error' ) ) {
@@ -439 +441 @@
 
     // A writable uploads dir will pass this test. Again, there's no point overriding this one.
-    if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
+    if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) )
         return $upload_error_handler( $file, $uploads['error'] );
 

trunk/wp-admin/includes/media.php

@@ -270 +270 @@
     $overrides = array('test_form'=>false);
 
-    $file = wp_handle_sideload($file_array, $overrides);
+    $time = current_time( 'mysql' );
+    if ( $post = get_post( $post_id ) ) {
+        if ( substr( $post->post_date, 0, 4 ) > 0 )
+            $time = $post->post_date;
+    }
+
+    $file = wp_handle_sideload( $file_array, $overrides, $time );
     if ( isset($file['error']) )
         return new WP_Error( 'upload_error', $file['error'] );