Return base dir and url from wp_upload_dir(). Props DD32. fixes WordPress#6762

ryanboren · ryanboren · commit 7d39052d9e3b · 2008-07-07T23:53:54.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@8280 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -1495,7 +1495,10 @@ function wp_upload_dir( $time = NULL ) {
 		$dir = ABSPATH . UPLOADS;
 		$url = trailingslashit( $siteurl ) . UPLOADS;
 	}
-	
+
+	$bdir = $dir; 
+	$burl = $url;
+
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
@@ -1515,7 +1518,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 );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1495,7 +1495,10 @@ function wp_upload_dir( $time = NULL ) {`
`1495`	`1495`	`$dir = ABSPATH . UPLOADS;`
`1496`	`1496`	`$url = trailingslashit( $siteurl ) . UPLOADS;`
`1497`	`1497`	`}`
`1498`		`-`
	`1498`	`+`
	`1499`	`+ $bdir = $dir;`
	`1500`	`+ $burl = $url;`
	`1501`	`+`
`1499`	`1502`	`$subdir = '';`
`1500`	`1503`	`if ( get_option( 'uploads_use_yearmonth_folders' ) ) {`
`1501`	`1504`	`// Generate the yearly and monthly dirs`
`@@ -1515,7 +1518,7 @@ function wp_upload_dir( $time = NULL ) {`
`1515`	`1518`	`return array( 'error' => $message );`
`1516`	`1519`	`}`
`1517`	`1520`
`1518`		`- $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'error' => false );`
	`1521`	`+ $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );`
`1519`	`1522`	`return apply_filters( 'upload_dir', $uploads );`
`1520`	`1523`	`}`
`1521`	`1524`