Changeset 9663

Timestamp:

11/13/2008 06:22:00 PM (16 years ago)

Author:

azaozz

Message:

Store uploads according to the parent post date when using year/month sub-directories

Location:

trunk/wp-admin/includes

Files:

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

trunk/wp-admin/includes/file.php

@@ -214 +214 @@
  * @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_upload( &$file, $overrides = false ) {
+function wp_handle_upload( &$file, $overrides = false, $time = null ) {
     // The default error handler.
     if (! function_exists( 'wp_handle_upload_error' ) ) {
@@ -282 +282 @@
 
     // 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

@@ -174 +174 @@
 function media_handle_upload($file_id, $post_id, $post_data = array()) {
     $overrides = array('test_form'=>false);
-    $file = wp_handle_upload($_FILES[$file_id], $overrides);
+    
+    $post = get_post($post_id);
+    $time = $post->post_date_gmt;
+
+    $file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
     if ( isset($file['error']) )