Ticket #14148: 14148.2.diff

src/wp-includes/media.php

@@ -223 +223 @@
 
         // try for a new style intermediate size
         if ( $intermediate = image_get_intermediate_size($id, $size) ) {
-                $img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
+                $img_url = str_replace($img_url_basename, urlencode( $intermediate['file'] ), $img_url);
                 $width = $intermediate['width'];
                 $height = $intermediate['height'];
                 $is_intermediate = true;
@@ -231 +231 @@
         elseif ( $size == 'thumbnail' ) {
                 // fall back to the old thumbnail
                 if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
-                        $img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
+                        $img_url = str_replace($img_url_basename, urlencode( wp_basename($thumb_file) ), $img_url);
                         $width = $info[0];
                         $height = $info[1];
                         $is_intermediate = true;

src/wp-includes/post.php

@@ -5047 +5047 @@
                         }
                 }
         }
+        $url = urlencode( $url );
 
         /*
          * If any of the above options failed, Fallback on the GUID as used pre-2.7,