Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 25568)
+++ wp-includes/functions.php	(working copy)
@@ -1556,7 +1556,7 @@
  * @return array See above for description.
  */
 function wp_upload_dir( $time = null ) {
-	$siteurl = get_option( 'siteurl' );
+	$siteurl = get_site_url();
 	$upload_path = trim( get_option( 'upload_path' ) );
 
 	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
@@ -1570,7 +1570,7 @@
 
 	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;
 	}