Changeset 11944 for trunk/wp-admin/includes/media.php

Timestamp:

09/17/2009 08:36:59 PM (17 years ago)

Author:

ryan

Message:

Press This fixes. Props noel. fixes #10784

File:

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

trunk/wp-admin/includes/media.php

@@ -250 +250 @@
 function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
         $overrides = array('test_form'=>false);
+        
         $file = wp_handle_sideload($file_array, $overrides);
-
         if ( isset($file['error']) )
                 return new WP_Error( 'upload_error', $file['error'] );
@@ -280 +280 @@
         ), $post_data );
 
-        // Save the data
+        // Save the attachment metadata
         $id = wp_insert_attachment($attachment, $file, $post_id);
         if ( !is_wp_error($id) ) {
@@ -521 +521 @@
 function media_sideload_image($file, $post_id, $desc = null) {
         if (!empty($file) ) {
-                $file_array['name'] = basename($file);
+                // Download file to temp location
                 $tmp = download_url($file);
+                
+                // Set variables for storage
+                // fix file filename for query strings
+                preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches);
+                $file_array['name'] = basename($matches[0]);
                 $file_array['tmp_name'] = $tmp;
-                $desc = @$desc;
-
+
+                // If error storing temporarily, unlink
                 if ( is_wp_error($tmp) ) {
                         @unlink($file_array['tmp_name']);
                         $file_array['tmp_name'] = '';
                 }
-
-                $id = media_handle_sideload($file_array, $post_id, $desc);
+                
+                // do the validation and storage stuff
+                $id = media_handle_sideload($file_array, $post_id, @$desc);
                 $src = $id;
-
+                
+                // If error storing permanently, unlink
                 if ( is_wp_error($id) ) {
                         @unlink($file_array['tmp_name']);
@@ -539 +546 @@
                 }
         }
-
+        
+        // Finally check to make sure the file has been saved, then return the html
         if ( !empty($src) ) {
                 $alt = @$desc;