Index: functions.php
===================================================================
--- functions.php	(revision 49)
+++ functions.php	(working copy)
@@ -1487,10 +1487,11 @@
 
 	// $dir is absolute, $path is (maybe) relative to ABSPATH
 	$dir = path_join( ABSPATH, $upload_path );
-
+	$path = str_replace( ABSPATH, '', trim( $upload_path ) );
+	
 	if ( !$url = get_option( 'upload_url_path' ) )
-		$url = WP_CONTENT_URL . '/uploads';
-
+		$url = trailingslashit( $siteurl ) . $path;
+	
 	if ( defined('UPLOADS') ) {
 		$dir = ABSPATH . UPLOADS;
 		$url = trailingslashit( $siteurl ) . UPLOADS;