Changeset 21219

Timestamp:

07/05/2012 08:51:55 PM (13 years ago)

Author:

markjaquith

Message:

Better image extension regexes, so we don't just grab the "jpe" from "jpeg" files in media_sideload_image(). props sivel. fixes #16693

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -600 +600 @@
         // 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;

trunk/wp-admin/press-this.php

@@ -173 +173 @@
         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);

trunk/wp-includes/post.php

@@ -4037 +4037 @@
     $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) )