Ticket #19629: 19629.4.diff

wp-admin/includes/deprecated.php

@@ -1188 +1188 @@
 function _relocate_children( $old_ID, $new_ID ) {
         _deprecated_function( __FUNCTION__, '3.9' );
 }
+
+
+/**
+ * Download an image from the specified URL and attach it to a post.
+ * This was once used by Press This
+ *
+ * @since 2.6.0
+ * @todo  add deprecated as of version
+ *
+ * @param string $file The URL of the image to download
+ * @param int $post_id The post ID the media is to be associated with
+ * @param string $desc Optional. Description of the image
+ * @return string|WP_Error Populated HTML img tag on success
+ */
+function media_sideload_image($file, $post_id, $desc = null) {
+        _deprecated_function( __FUNCTION__, '3.9' );
+        return wp_get_attachment_image( media_handle_sideload( $file, $post_id, $desc ), 'full' );
+}

wp-admin/includes/media.php

@@ -353 +353 @@
  *
  * @since 2.6.0
  *
- * @param array $file_array Array similar to a {@link $_FILES} upload array
+ * @param string|array $file A URL as a string, or an array similar to a {@link $_FILES} upload array
  * @param int $post_id The post ID the media is associated with
  * @param string $desc Description of the sideloaded file
  * @param array $post_data allows you to overwrite some of the attachment
  * @return int|object The ID of the attachment or a WP_Error on failure
  */
-function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
+function media_handle_sideload( $file, $post_id, $desc = null, $post_data = array()) {
+        $downloading_url = is_string( $file );
+
+        if ( $downloading_url ) {
+                // Download file to temp location
+                $tmp = download_url( $file );
+
+                if ( is_wp_error( $tmp ) )
+                        return $tmp;
+
+                $file_array = array(
+                        'name' => preg_replace( '/\?.*/', '', $file ), // Strip query string (might need to be better)
+                        'tmp_name' => $tmp,
+                );
+        }
+
         $overrides = array('test_form'=>false);
 
         $time = current_time( 'mysql' );
@@ -369 +384 @@
         }
 
         $file = wp_handle_sideload( $file_array, $overrides, $time );
-        if ( isset($file['error']) )
+        if ( isset( $file['error'] ) ) {
+                if ( $downloading_url )
+                        @unlink( $tmp );
                 return new WP_Error( 'upload_error', $file['error'] );
+        }
 
         $url = $file['url'];
         $type = $file['type'];
@@ -791 +809 @@
 }
 
 /**
- * Download an image from the specified URL and attach it to a post.
- *
- * @since 2.6.0
- *
- * @param string $file The URL of the image to download
- * @param int $post_id The post ID the media is to be associated with
- * @param string $desc Optional. Description of the image
- * @return string|WP_Error Populated HTML img tag on success
- */
-function media_sideload_image($file, $post_id, $desc = null) {
-        if ( ! empty($file) ) {
-                // Download file to temp location
-                $tmp = download_url( $file );
-
-                // Set variables for storage
-                // fix file filename for query strings
-                preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
-                $file_array['name'] = basename($matches[0]);
-                $file_array['tmp_name'] = $tmp;
-
-                // If error storing temporarily, unlink
-                if ( is_wp_error( $tmp ) ) {
-                        @unlink($file_array['tmp_name']);
-                        $file_array['tmp_name'] = '';
-                }
-
-                // do the validation and storage stuff
-                $id = media_handle_sideload( $file_array, $post_id, $desc );
-                // If error storing permanently, unlink
-                if ( is_wp_error($id) ) {
-                        @unlink($file_array['tmp_name']);
-                        return $id;
-                }
-
-                $src = wp_get_attachment_url( $id );
-        }
-
-        // Finally check to make sure the file has been saved, then return the html
-        if ( ! empty($src) ) {
-                $alt = isset($desc) ? esc_attr($desc) : '';
-                $html = "<img src='$src' alt='$alt' />";
-                return $html;
-        }
-}
-
-/**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0

wp-admin/press-this.php

@@ -43 +43 @@
                         // see if files exist in content - we don't want to upload non-used selected files.
                         if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
                                 $desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
-                                $upload = media_sideload_image($image, $post_ID, $desc);
-
+                                $upload = wp_get_attachment_image( media_handle_sideload( $image, $post_id, $desc ), 'full' );
                                 // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
-                                if ( !is_wp_error($upload) )
+                                if ( ! empty($upload) ) {
                                         $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
+                                }
+
                         }
                 }
         }