Changeset 3413 for trunk/wp-includes/functions-post.php

Timestamp:

01/09/2006 10:24:57 PM (21 years ago)

Author:

ryan

Message:

Add upload folder options. Props David House. fixes #2206

File:

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

trunk/wp-includes/functions-post.php

@@ -877 +877 @@
 // Returns an array containing the current upload directory's path and url, or an error message.
 function wp_upload_dir() {
-        $dir = trim(get_settings('fileupload_realpath'));
-        $url = trim(get_settings('fileupload_url'));
-
-        $custom = true;
-        if ( empty($dir) || empty($url) ) {
+        $siteurl = get_settings('siteurl');
+        //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
+        $dir = ABSPATH . str_replace(ABSPATH, '', trim(get_settings('fileupload_realpath')));
+        $url = $siteurl . str_replace($siteurl, '', trim(get_settings('fileupload_url')));
+
+        if ( $dir == ABSPATH ) { //the option was empty
                 $dir = ABSPATH . 'wp-content/uploads';
-                $url = get_option('siteurl') . '/wp-content/uploads';
-                $custom = false;
+        }
+        if ( $url == $siteurl ) { //the option was empty
+                $url = get_option('siteurl') . '/' . str_replace(ABSPATH, '', $dir);
         }
 
@@ -890 +892 @@
                 $dir = ABSPATH . UPLOADS;
                 $url =  get_option('siteurl') . '/' . UPLOADS;
-                $custom = false;
-        }
-
-        if ( ! $custom) {
+        }
+
+        if ( get_settings('uploads_yearmonth_folders')) {
                 // Generate the yearly and monthly dirs
                 $time = current_time( 'mysql' );