Changeset 6780

Timestamp:

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

Author:

matt

Message:

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

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-misc.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -239 +239 @@
     add_option('show_avatars', '1');
     add_option('avatar_rating', 'G');
+    add_option('upload_url_path', '');
 
     // Delete unused options

trunk/wp-admin/options-misc.php

@@ -24 +24 @@
 </td>
 </tr>
+
+<tr valign="top">
+<th scope="row"><?php _e('Full URL path to files (optional)'); ?>:</th>
+<td><input name="upload_url_path" type="text" id="upload_url_path" class="code" value="<?php echo attribute_escape( get_option('upload_url_path')); ?>" size="40" />
+</td>
+</tr>
+
 <tr>
 <td></td>
@@ -44 +51 @@
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" />
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,upload_url_path" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>

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