Ticket #16693: 16693.5.diff

wp-includes/post.php

@@ -4033 +4033 @@
 
         $ext = preg_match('/\.([^.]+)$/', $file, $matches) ? strtolower($matches[1]) : false;
 
-        $image_exts = array('jpg', 'jpeg', 'gif', 'png');
+        $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
 
         if ( 'image/' == substr($post->post_mime_type, 0, 6) || $ext && 'import' == $post->post_mime_type && in_array($ext, $image_exts) )
                 return true;

wp-admin/includes/media.php

@@ -599 +599 @@
 
                 // Set variables for storage
                 // fix file filename for query strings
-                preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches);
+                preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
                 $file_array['name'] = basename($matches[0]);
                 $file_array['tmp_name'] = $tmp;
 

wp-admin/press-this.php

@@ -172 +172 @@
                  */
                 function get_images_from_uri($uri) {
                         $uri = preg_replace('/\/#.+?$/','', $uri);
-                        if ( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
+                        if ( preg_match( '/\.(jpe?g|jpe|gif|png)\b/i', $uri ) && !strpos( $uri, 'blogger.com' ) )
                                 return "'" . esc_attr( html_entity_decode($uri) ) . "'";
                         $content = wp_remote_fopen($uri);
                         if ( false === $content )