Changeset 31799 for trunk/src/wp-admin/includes/media.php

Timestamp:

03/17/2015 12:46:01 AM (11 years ago)

Author:

azaozz

Message:

Press This:

• Strip slashes while running side_load_images(), add slashes after.
• Simplify and clean up side_load_images().
• Add another arg to media_sideload_image() to return the uploaded image src only, and fix it to always return WP_Error on errors.

Fixes #31660.

File:

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

trunk/src/wp-admin/includes/media.php

@@ -830 +830 @@
  * @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. What to return: an image tag (default) or only the src.
  * @return string|WP_Error Populated HTML img tag on success
  */
-function media_sideload_image( $file, $post_id, $desc = null ) {
+function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
     if ( ! empty( $file ) ) {
         // Set variables for storage, fix file filename for query strings.
@@ -861 +862 @@
     // 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' );
     }
 }