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

Timestamp:

01/14/2006 10:09:51 PM (20 years ago)

Author:

ryan

Message:

More upload path tweaks. fixes #2271

File:

• trunk/wp-includes/functions-post.php (modified) (1 diff)

trunk/wp-includes/functions-post.php

@@ -879 +879 @@
     $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')));
+    $path = str_replace(ABSPATH, '', trim(get_settings('upload_path')));
+    $dir = ABSPATH . $path;
+    $url = trailingslashit($siteurl) . $path;
 
     if ( $dir == ABSPATH ) { //the option was empty
         $dir = ABSPATH . 'wp-content/uploads';
     }
-    if ( $url == $siteurl ) { //the option was empty
-        $url = get_option('siteurl') . '/' . str_replace(ABSPATH, '', $dir);
-    }
 
     if ( defined('UPLOADS') ) {
         $dir = ABSPATH . UPLOADS;
-        $url =  get_option('siteurl') . '/' . UPLOADS;
-    }
-
-    if ( get_settings('uploads_yearmonth_folders')) {
+        $url = trailingslashit($siteurl) . UPLOADS;
+    }
+
+    if ( get_settings('uploads_use_yearmonth_folders')) {
         // Generate the yearly and monthly dirs
         $time = current_time( 'mysql' );