Ticket #35045: image_base_url.diff

wp-includes/media.php

@@ -1286 +1286 @@
                 $image_base_url .= trailingslashit( $dirname );
         }
 
+        // set base url scheme to match image source for consistent comparisons
+        if ( strpos( $image_src, '//' ) === 0 ) {
+                // protocol-relative URL, no protocol scheme
+                $image_base_url = preg_replace( '#^https?://#i', '//', $image_base_url );
+        } else {
+                $scheme = parse_url( $image_src, PHP_URL_SCHEME );
+                $image_base_url = set_url_scheme( $image_base_url, $scheme );
+        }
+
         $all_sizes = wp_list_pluck( $image_meta['sizes'], 'file' );
 
         foreach ( $all_sizes as $key => $file ) {
@@ -1293 +1302 @@
         }
 
         // Add the original image.
-        $all_sizes[] = $base_url . $image_meta['file'];
+        $all_sizes[] = $image_base_url . $image_meta['file'];
 
         // Bail early if the image src doesn't match any of the known image sizes.
         if ( ! in_array( $image_src, $all_sizes ) ) {