Ticket #36549: 36549.3.diff

src/wp-includes/media.php

@@ -1142 +1142 @@
          * @param array  $size_array    Array of width and height values in pixels (in that order).
          * @param string $image_src     The 'src' of the image.
          * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
-         * @param int    $attachment_id Image attachment ID or 0.
+         * @param int    $attachment_id Image attachment ID or 0.
          */
         $sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
 
@@ -1154 +1154 @@
         $srcset = '';
 
         foreach ( $sources as $source ) {
-                $srcset .= $source['url'] . ' ' . $source['value'] . $source['descriptor'] . ', ';
+                $srcset .= str_replace( ' ', '%20', $source['url'] ) . ' ' . $source['value'] . $source['descriptor'] . ', ';
         }
 
         return rtrim( $srcset, ', ' );