From 8415bccde9a9118089ce51f438db0a4204b16395 Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Mon, 3 Mar 2008 04:14:16 +0000 Subject: [PATCH] Deal correctly with empty upload_path option. Hat tip: tellyworth. git-svn-id: https://develop.svn.wordpress.org/trunk@7134 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 661a79ffc3..77392b0e7b 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -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;