Changeset 8353

Timestamp:

07/16/2008 04:49:53 PM (16 years ago)

Author:

ryan

Message:

Derive the upload url from the upload path if no url given. fixes #7308 for 2.6

File:

• branches/2.6/wp-includes/functions.php (modified) (1 diff)

branches/2.6/wp-includes/functions.php

@@ -1482 +1482 @@
     $siteurl = get_option( 'siteurl' );
     $upload_path = get_option( 'upload_path' );
-    if ( trim($upload_path) === '' )
-        $upload_path = WP_CONTENT_DIR . '/uploads';
-    $dir = $upload_path;
+    $upload_path = trim($upload_path);
+    if ( empty($upload_path) )
+        $dir = WP_CONTENT_DIR . '/uploads';
+    else 
+        $dir = $upload_path;
 
     // $dir is absolute, $path is (maybe) relative to ABSPATH
-    $dir = path_join( ABSPATH, $upload_path );
-
-    if ( !$url = get_option( 'upload_url_path' ) )
-        $url = WP_CONTENT_URL . '/uploads';
+    $dir = path_join( ABSPATH, $dir );
+
+    if ( !$url = get_option( 'upload_url_path' ) ) {
+        if ( empty($upload_path) )
+            $url = WP_CONTENT_URL . '/uploads';
+        else
+            $url = trailingslashit( $siteurl ) . $upload_path;
+    }
 
     if ( defined('UPLOADS') ) {