Changeset 14510

Timestamp:

05/07/2010 10:50:05 PM (15 years ago)

Author:

wpmuguru

Message:

add upload dir support to switch to blog, props ocean90, see #11998

File:

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

trunk/wp-includes/functions.php

@@ -2115 +2115 @@
  */
 function wp_upload_dir( $time = null ) {
+    global $switched;
     $siteurl = get_option( 'siteurl' );
     $upload_path = get_option( 'upload_path' );
@@ -2137 +2138 @@
     }
 
-    if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
+    if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
         $dir = ABSPATH . UPLOADS;
         $url = trailingslashit( $siteurl ) . UPLOADS;
     }
 
-    if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
+    if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
         if ( defined( 'BLOGUPLOADDIR' ) )
             $dir = untrailingslashit(BLOGUPLOADDIR);