From bb260cb1234422a27c7e7d380f6c047d80bc49ed Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 8 Jul 2008 11:16:47 +0000
Subject: WP merge to revision 8283

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1356 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/functions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'wp-includes/functions.php')

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index bcec475..332f831 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1488,6 +1488,9 @@ function wp_upload_dir( $time = NULL ) {
 		$url = trailingslashit( $siteurl ) . UPLOADS;
 	}
 
+	$bdir = $dir; 
+	$burl = $url;
+
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
@@ -1507,7 +1510,7 @@ function wp_upload_dir( $time = NULL ) {
 		return array( 'error' => $message );
 	}
 
-	$uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'error' => false );
+	$uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
 	return apply_filters( 'upload_dir', $uploads );
 }
 
-- 
cgit