Ticket #15928: 15928.12.patch

src/wp-includes/post.php

@@ -4946 +4946 @@
                 $url = get_the_guid( $post->ID );
         }
 
+        // Return an https url when calling from an ssl connection on the same host
+        if ( is_ssl() && 'https' !== substr( $url, 0, 5 ) ) {
+                if ( parse_url( $url, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
+                        $url = set_url_scheme( $url, 'https' );
+                }
+        }
+
         /**
          * Filter the attachment URL.
          *

tests/phpunit/tests/post/attachments.php

@@ -278 +278 @@
                 $this->assertEquals( $attachment->post_parent, $post_id );
         }
 
+        /**
+         * @ticket 15928
+         */
+        public function test_wp_get_attachment_with_https_off() {
+                $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_id = $this->_make_attachment( $upload );
+
+                // Save server data for cleanup
+                $is_ssl = is_ssl();
+                $_SERVER['HTTPS'] = 'off';
+
+                // Find out what scheme is coming out of wp_upload_dir()
+                $upload_dir = wp_upload_dir();
+                $scheme = parse_url( $upload_dir['baseurl'] , PHP_URL_SCHEME );
+
+                // Test that wp_get_attachemt_url returns the same scheme as the uploads dir
+                $url = wp_get_attachment_url( $attachment_id );
+                $this->assertSame( set_url_scheme( $url, $scheme ), $url );
+
+                // Cleanup
+                $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+        }
+
+        /**
+         * @ticket 15928
+         */
+        public function test_wp_get_attachment_url_with_https_on_same_host() {
+                $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_id = $this->_make_attachment( $upload );
+
+                // Save server data for cleanup
+                $is_ssl = is_ssl();
+                $http_host = $_SERVER['HTTP_HOST'];
+
+                $_SERVER['HTTPS'] = 'on';
+
+                // Set server host to match the host of wp_upload_dir()
+                $upload_dir = wp_upload_dir();
+                $_SERVER['HTTP_HOST'] = parse_url( $upload_dir['baseurl'], PHP_URL_HOST );
+
+                // Test that wp_get_attachemt_url returns with https scheme
+                $url = wp_get_attachment_url( $attachment_id );
+                $this->assertSame( set_url_scheme( $url, 'https' ), $url );
+
+                // Cleanup
+                $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+                $_SERVER['HTTP_HOST'] = $http_host;
+        }
+
+        /**
+        * @ticket 15928
+        */
+        public function test_wp_get_attachment_url_with_https_on_diff_host() {
+                $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_id = $this->_make_attachment( $upload );
+
+                // 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';
+
+                // Find out what scheme is coming out of wp_upload_dir()
+                $upload_dir = wp_upload_dir();
+                $scheme = parse_url( $upload_dir['baseurl'] , PHP_URL_SCHEME );
+
+                // Test that wp_get_attachemt_url returns the same scheme as the uploads dir
+                $url = wp_get_attachment_url( $attachment_id );
+                $this->assertSame( set_url_scheme( $url, $scheme ), $url );
+
+                // Cleanup
+                $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+                $_SERVER['HTTP_HOST'] = $http_host;
+        }
+
 }