Ticket #32145: wp-get-attachment-url.diff

src/wp-includes/post.php

@@ -4959 +4959 @@
  * @return string|bool Attachment URL, otherwise false.
  */
 function wp_get_attachment_url( $post_id = 0 ) {
+        global $blog_id;
+
         $post_id = (int) $post_id;
         if ( !$post = get_post( $post_id ) )
                 return false;
@@ -4976 +4978 @@
                                 // Replace file location with url location.
                                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
                         } elseif ( false !== strpos($file, 'wp-content/uploads') ) {
-                                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+
+                                if ( is_main_site() ) {
+                                        $url = $uploads['baseurl'] . substr( $file, strpos( $file, 'wp-content/uploads' ) + 18 );
+                                } else {
+                                        $url = $uploads['baseurl'] . substr( $file, strpos( $file, 'wp-content/uploads/sites/' . $blog_id ) + 25 + strlen( $blog_id ) );
+                                }
+
                         } else {
                                 // It's a newly-uploaded file, therefore $file is relative to the basedir.
                                 $url = $uploads['baseurl'] . "/$file";

tests/phpunit/tests/post/attachments.php

@@ -439 +439 @@
                 $_SERVER['HTTP_HOST'] = $http_host;
         }
 
+        /**
+         *  wp_get_attachment_url append /sites/$blog_id/ twice when attach same image to multiple posts in mu site
+         */
+        public function test_wp_get_attachment_url_not_working_in_mu_site_when_attach_same_image_to_multiple_posts() {
+                $blog_id = $this->factory->blog->create();
+
+                switch_to_blog( $blog_id );
+
+                $siteurl = get_option( 'siteurl' );
+                update_option( 'siteurl', set_url_scheme( $siteurl, 'https' ) );
+
+                $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
+                $contents = file_get_contents( $filename );
+
+                $upload = wp_upload_bits( basename( $filename ), null, $contents );
+                $this->assertTrue( empty( $upload['error'] ) );
+
+                // Set attachment ID
+                $attachment_id1 = $this->_make_attachment( $upload );
+
+                $file = get_post( $attachment_id1 );
+                $args = array(
+                        'post_mime_type' => $file->post_mime_type,
+                        'guid'           => $file->guid,
+                        'post_title'     => $file->post_title,
+                        'post_content'   => $file->post_content,
+                        'post_parent'    => 0,
+                );
+
+                $attachment_id2 = wp_insert_attachment( $args, wp_get_attachment_url( $attachment_id1 ), '0' );
+
+                // Save server data for cleanup.
+                $is_ssl    = is_ssl();
+                $http_host = $_SERVER['HTTP_HOST'];
+
+                $_SERVER['HTTPS'] = 'on';
+
+                // Set server host to something random.
+                $_SERVER['HTTP_HOST'] = 'some.otherhostname.com';
+
+                $url1 = wp_get_attachment_url( $attachment_id1 );
+                $this->assertSame( set_url_scheme( $url1, 'http' ), $url1 );
+
+                $url2 = wp_get_attachment_url( $attachment_id2 );
+                $this->assertSame( set_url_scheme( $url2, 'http' ), $url2 );
+
+                //Both attachments url should be same
+                $this->assertSame( $url1, $url2 );
+
+                // Cleanup.
+                $_SERVER['HTTPS']     = $is_ssl ? 'on' : 'off';
+                $_SERVER['HTTP_HOST'] = $http_host;
+
+                restore_current_blog();
+        }
+
         public function test_wp_attachment_is() {
                 $filename = DIR_TESTDATA . '/images/test-image.jpg';
                 $contents = file_get_contents( $filename );