Ticket #25650: 25650_approach_1.patch

src/wp-content/plugins/hello.php

@@ -79 +79 @@
 
 add_action( 'admin_head', 'dolly_css' );
 
+
+add_action( 'init', 'test' );
+function test() {
+        var_dump(wp_upload_dir());
+
+        switch_to_blog( 7 );
+        var_dump(wp_upload_dir());
+        restore_current_blog();
+
+        wp_die();
+}
 ?>

src/wp-includes/functions.php

@@ -1824 +1824 @@
 
         if ( !$url = get_option( 'upload_url_path' ) ) {
                 if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-                        $url = WP_CONTENT_URL . '/uploads';
+                        $url = content_url() . '/uploads';
                 else
                         $url = trailingslashit( $siteurl ) . $upload_path;
         }

src/wp-includes/link-template.php

@@ -3126 +3126 @@
  * @return string Content url link with optional path appended.
  */
 function content_url($path = '') {
-        $url = set_url_scheme( WP_CONTENT_URL );
+        global $wp_content_url;
 
+        if ( empty( $wp_content_url ) ) {
+                $wp_content_url = WP_CONTENT_URL;
+        }
+
+        $url = set_url_scheme( $wp_content_url );
+
         if ( $path && is_string( $path ) )
                 $url .= '/' . ltrim($path, '/');
 

src/wp-includes/ms-blogs.php

@@ -666 +666 @@
                 $current_user->for_blog( $new_blog );
         }
 
+        // Change the content URL to the new blog
+        global $wp_content_url;
+
+        if ( empty( $wp_content_url ) ) {
+                $wp_content_url = WP_CONTENT_URL;
+        }
+
+        $new_blog_details = get_blog_details( $new_blog );
+        $prev_blog_details = get_blog_details( $prev_blog_id );
+
+        $wp_content_url = str_replace( $prev_blog_details->siteurl, $new_blog_details->siteurl, $wp_content_url );
+
         /** This filter is documented in wp-includes/ms-blogs.php */
         do_action( 'switch_blog', $new_blog, $prev_blog_id );
         $GLOBALS['switched'] = true;