Changeset 37034 for trunk/src/wp-includes/media.php

Timestamp:

03/18/2016 07:44:50 PM (10 years ago)

Author:

azaozz

Message:

Responsive Images: the src of the image has to be first in the srcset, because of a bug in iOS8. Update the unit tests to reflect the changes.

Props jaspermdegroot, joemcgill, azaozz.
Fixes #35030.

File:

• trunk/src/wp-includes/media.php (modified) (4 diffs)

trunk/src/wp-includes/media.php

@@ -1068 +1068 @@
          */
         foreach ( $image_sizes as $image ) {
+                $is_src = false;
 
                 // Check if image meta isn't corrupted.
@@ -1076 +1077 @@
                 // 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;
                 }
 
@@ -1088 +1089 @@
                  * 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;
                 }
@@ -1110 +1109 @@
                 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'],
                         );
+
+                        // The 'src' image has to be the first in the 'srcset', because of a bug in iOS8. See #35030.
+                        if ( $is_src ) {
+                                $sources = array( $image['width'] => $source ) + $sources;
+                        } else {
+                                $sources[ $image['width'] ] = $source;
+                        }
                 }
         }