From 7138b7e1bd64277e3094d58ea8557130c6914ad2 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <drewapicture@git.wordpress.org>
Date: Tue, 5 May 2015 02:15:27 +0000
Subject: [PATCH] Add two changelog entries for functional changes introduced
 in 4.2.0.

Props dimadin.
See #31925.


git-svn-id: https://develop.svn.wordpress.org/trunk@32350 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/media.php | 3 ++-
 src/wp-includes/post.php        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 086682088a..7299dc247f 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/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/src/wp-includes/post.php b/src/wp-includes/post.php
index d0ecd2e04e..4d1c61a768 100644
--- a/src/wp-includes/post.php
+++ b/src/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.