WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deal correctly with empty upload_path option. Hat tip: tellyworth. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2008-03-03 04:14:16 +00:00
parent bee4e17d23
commit bf18e2fd3f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/functions.php
View File

@ -1063,7 +1063,10 @@ function path_join( $base, $path ) {
// Returns an array containing the current upload directory's path and url, or an error message.
function wp_upload_dir( $time = NULL ) {
$siteurl = get_option( 'siteurl' );
$upload_path = $dir = get_option( 'upload_path' );
$upload_path = get_option( 'upload_path' );
if ( trim($upload_path) === '' )
$upload_path = 'wp-content/uploads';
$dir = $upload_path;
// $dir is absolute, $path is (maybe) relative to ABSPATH
$dir = path_join( ABSPATH, $upload_path );
@ -1072,9 +1075,6 @@ function wp_upload_dir( $time = NULL ) {
if ( !$url = get_option( 'upload_url_path' ) )
$url = trailingslashit( $siteurl ) . $path;
if ( $dir == ABSPATH ) // the option was empty
$dir = ABSPATH . 'wp-content/uploads';
if ( defined('UPLOADS') ) {
$dir = ABSPATH . UPLOADS;
$url = trailingslashit( $siteurl ) . UPLOADS;