From cf566ef990f4a235210261cbc8ae526a9f4c479f Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 7 Jul 2008 23:53:54 +0000 Subject: [PATCH] Return base dir and url from wp_upload_dir(). Props DD32. fixes #6762 git-svn-id: http://svn.automattic.com/wordpress/trunk@8280 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 4df63b28e..fcb22f487 100644 --- 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 ); }