Changeset 6780 for trunk/wp-includes/functions.php

Timestamp:

02/11/2008 06:35:24 AM (19 years ago)

Author:

matt

Message:

Allow uploads outside of the WP path and custom URLs for the same.

File:

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

trunk/wp-includes/functions.php

@@ -1027 +1027 @@
 function wp_upload_dir( $time = NULL ) {
         $siteurl = get_option( 'siteurl' );
-        //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
-        $path = str_replace( ABSPATH, '', trim( get_option( 'upload_path' ) ) );
-        $dir = ABSPATH . $path;
-        $url = trailingslashit( $siteurl ) . $path;
+        $upload_path = $dir = get_option( 'upload_path' );
+        
+        if ( $upload_path != realpath( $upload_path ) ) { // not an absolute path
+                //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
+                $path = str_replace( ABSPATH, '', trim( $upload_path ) );
+                $dir = ABSPATH . $path;
+        }
+
+        if ( !$url = get_option( 'upload_url_path' ) )
+                $url = trailingslashit( $siteurl ) . $path;
 
         if ( $dir == ABSPATH ) // the option was empty