Ticket #34945: 34945.2.diff

src/wp-includes/media.php

@@ -917 +917 @@
 
         if ( empty( $baseurl[$blog_id] ) ) {
                 $uploads_dir = wp_upload_dir();
-                $baseurl[$blog_id] = $uploads_dir['baseurl'];
+                /*
+                 * If currently on SSL, prefer HTTPS URLs when we know they're supported by the domain
+                 * (which is to say, when they share the domain name of the current SSL page).
+                 */
+                if ( is_ssl() && 'https' !== substr( $uploads_dir['baseurl'], 0, 5 ) && parse_url( $uploads_dir['baseurl'], PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
+                        $baseurl[$blog_id] = set_url_scheme( $uploads_dir['baseurl'] );
+                }
         }
 
         return $baseurl[$blog_id];

tests/phpunit/tests/media.php

@@ -1302 +1302 @@
                 $actual     = wp_make_content_images_responsive( $unfiltered );
 
                 $this->assertSame( $expected, $actual );
+}
+
+        /**
+         * @ticket 34945
+         * @ticket 33641
+         */
+        function test_wp_get_attachment_image_with_https_on() {
+                // Save server data for cleanup
+                $is_ssl = is_ssl();
+
+                // Mock meta for the image.
+                $image_meta = array(
+                        'width' => 1200,
+                        'height' => 600,
+                        'file' => 'test.jpg',
+                        'sizes' => array(
+                                'thumbnail' => array(
+                                        'file' => 'test-150x150.jpg',
+                                        'width' => 150,
+                                        'height' => 150,
+                                ),
+                                'medium' => array(
+                                        'file' => 'test-300x150.jpg',
+                                        'width' => 300,
+                                        'height' => 150,
+                                ),
+                                'large' => array(
+                                        'file' => 'test-1024x512.jpg',
+                                        'width' => 1024,
+                                        'height' => 512,
+                                ),
+                        )
+                );
+
+                // Test using the large file size.
+                $size_array = array(1024, 512);
+                $image_url  = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['sizes']['large']['file'];
+
+                $_SERVER['HTTPS'] = 'on';
+
+                $expected = 'https://example.org/wp-content/uploads/test-300x150.jpg 300w, https://example.org/wp-content/uploads/test-1024x512.jpg 1024w, https://example.org/wp-content/uploads/test.jpg 1200w';
+
+                $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
+
+                // Cleanup
+                $_SERVER['HTTPS'] = $is_ssl;
         }
 }