Changeset 7134

Timestamp:

03/03/2008 04:14:16 AM (17 years ago)

Author:

matt

Message:

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

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1064 +1064 @@
 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
@@ -1072 +1075 @@
     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') ) {