Ticket #15928: 15928.2.patch

wp-includes/functions.php

@@ -2217 +2217 @@
  */
 function wp_upload_dir( $time = null ) {
         global $switched;
-        $siteurl = get_option( 'siteurl' );
+        $siteurl = get_site_url();
         $upload_path = get_option( 'upload_path' );
         $upload_path = trim($upload_path);
         $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
@@ -2235 +2235 @@
 
         if ( !$url = get_option( 'upload_url_path' ) ) {
                 if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-                        $url = WP_CONTENT_URL . '/uploads';
+                        $url = content_url('uploads');
                 else
                         $url = trailingslashit( $siteurl ) . $upload_path;
         }