Ticket #19629: 19629-deprecated.2.diff

src/wp-admin/includes/class-wp-press-this.php

@@ -80 +80 @@
                                 }
 
                                 // Sideload image, which gives us a new image src.
-                                $new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+                                $new_src_id = media_handle_sideload( $image_src, $post_id, null );
 
-                                if ( ! is_wp_error( $new_src ) ) {
+                                if ( ! is_wp_error( $new_src_id ) ) {
+                                        $new_src = wp_get_attachment_url( $new_src_id );
                                         // Replace the POSTED content <img> with correct uploaded ones.
                                         // Need to do it in two steps so we don't replace links to the original image if any.
                                         $new_image = str_replace( $image_src, $new_src, $image );

src/wp-admin/includes/deprecated.php

@@ -1183 +1183 @@
 function _relocate_children( $old_ID, $new_ID ) {
         _deprecated_function( __FUNCTION__, '3.9' );
 }
+
+/**
+ * Downloads an image from the specified URL and attaches it to a post.
+ *
+ * @since 2.6.0
+ * @since 4.2.0 Introduced the `$return` parameter.
+ * @deprecated X.X.X
+ *
+ * @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.
+ * @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'.
+ * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise.
+ */
+function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
+        _deprecated_function( __FUNCTION__, 'X.X.X' );
+        if ( ! empty( $file ) ) {
+
+                // Set variables for storage, fix file filename for query strings.
+                preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+                $file_array = array();
+                $file_array['name'] = basename( $matches[0] );
+
+                // Download file to temp location.
+                $file_array['tmp_name'] = download_url( $file );
+
+                // If error storing temporarily, return the error.
+                if ( is_wp_error( $file_array['tmp_name'] ) ) {
+                        return $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 ) ) {
+                if ( $return === 'src' ) {
+                        return $src;
+                }
+
+                $alt = isset( $desc ) ? esc_attr( $desc ) : '';
+                $html = "<img src='$src' alt='$alt' />";
+                return $html;
+        } else {
+                return new WP_Error( 'image_sideload_failed' );
+        }
+}
+ No newline at end of file

src/wp-admin/includes/media.php

@@ -827 +827 @@
 }
 
 /**
- * Downloads an image from the specified URL and attaches it to a post.
- *
- * @since 2.6.0
- * @since 4.2.0 Introduced the `$return` parameter.
- *
- * @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.
- * @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'.
- * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise.
- */
-function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
-        if ( ! empty( $file ) ) {
-
-                // Set variables for storage, fix file filename for query strings.
-                preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
-                $file_array = array();
-                $file_array['name'] = basename( $matches[0] );
-
-                // Download file to temp location.
-                $file_array['tmp_name'] = download_url( $file );
-
-                // If error storing temporarily, return the error.
-                if ( is_wp_error( $file_array['tmp_name'] ) ) {
-                        return $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 ) ) {
-                if ( $return === 'src' ) {
-                        return $src;
-                }
-
-                $alt = isset( $desc ) ? esc_attr( $desc ) : '';
-                $html = "<img src='$src' alt='$alt' />";
-                return $html;
-        } else {
-                return new WP_Error( 'image_sideload_failed' );
-        }
-}
-
-/**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0