Ticket #6073: wp_upload_dir_bug-r7133.patch

wordpress/wp-includes/functions.php

@@ -1063 +1063 @@
 // Returns an array containing the current upload directory's path and url, or an error message.
 function wp_upload_dir( $time = NULL ) {
         $siteurl = get_option( 'siteurl' );
-        $upload_path = $dir = get_option( 'upload_path' );
+        $upload_path = get_option( 'upload_path' );
+        if ( trim($upload_path) === '' )
+                $upload_path = 'wp-content/uploads';
+        $dir = $upload_path;
 
         // $dir is absolute, $path is (maybe) relative to ABSPATH
         $dir = path_join( ABSPATH, $upload_path );
@@ -1072 +1075 @@
         if ( !$url = get_option( 'upload_url_path' ) )
                 $url = trailingslashit( $siteurl ) . $path;
 
-        if ( $dir == ABSPATH ) // the option was empty
-                $dir = ABSPATH . 'wp-content/uploads';
-
         if ( defined('UPLOADS') ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;