Ticket #35030: 35030.2.patch

src/wp-includes/media.php

@@ -1062 +1062 @@
          */
         $src_matched = false;
 
+        $is_iOS = ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false );
+
         /*
          * Loop through available images. Only use images that are resized
          * versions of the same edit.
          */
         foreach ( $image_sizes as $image ) {
+                $is_src = false;
 
                 // Check if image meta isn't corrupted.
                 if ( ! is_array( $image ) ) {
@@ -1075 +1078 @@
 
                 // If the file name is part of the `src`, we've confirmed a match.
                 if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
-                        $src_matched = true;
+                        $src_matched = $is_src = true;
                 }
 
                 // Filter out images that are from previous edits.
@@ -1087 +1090 @@
                  * Filter out images that are wider than '$max_srcset_image_width' unless
                  * that file is in the 'src' attribute.
                  */
-                if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width &&
-                        false === strpos( $image_src, $image['file'] ) ) {
-
+                if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width && ! $is_src ) {
                         continue;
                 }
 
@@ -1109 +1110 @@
                 // If the image dimensions are within 1px of the expected size, use it.
                 if ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 ) {
                         // Add the URL, descriptor, and value to the sources array to be returned.
-                        $sources[ $image['width'] ] = array(
+                        $source = array(
                                 'url'        => $image_baseurl . $image['file'],
                                 'descriptor' => 'w',
                                 'value'      => $image['width'],
                         );
+
+                        // iOS 8 is buggy. Make sure the src URL is first in the srcset.
+                        if ( $is_iOS && $is_src ) {
+                                $sources = array_merge( array( $image['width'] => $source ), $sources );
+                        } else {
+                                $sources[ $image['width'] ] = $source;
+                        }
                 }
         }