diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 086682088a..7299dc247f 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -825,11 +825,12 @@ function wp_media_upload_handler() { * Download an image from the specified URL and attach 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. What to return: an image tag (default) or only the src. + * @param string $return Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'. * @return string|WP_Error Populated HTML img tag on success */ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) { diff --git a/wp-includes/post.php b/wp-includes/post.php index d0ecd2e04e..4d1c61a768 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -5132,7 +5132,8 @@ function wp_attachment_is( $type, $post_id = 0 ) { * Checks if the attachment is an image. * * @since 2.1.0 - * @since 4.2.0 Modified into wrapper for wp_attachment_is() + * @since 4.2.0 Modified into wrapper for wp_attachment_is() and + * allowed WP_Post object to be passed. * * @param int|WP_Post $post Optional. Attachment ID. Default 0. * @return bool Whether the attachment is an image. diff --git a/wp-includes/version.php b/wp-includes/version.php index 9d1bdbb3d3..9f6cb5f2cd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32349'; +$wp_version = '4.3-alpha-32350'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.