WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add two changelog entries for functional changes introduced in 4.2.0. 

Props dimadin.
See #31925.

Built from https://develop.svn.wordpress.org/trunk@32350


git-svn-id: http://core.svn.wordpress.org/trunk@32321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-05-05 02:16:25 +00:00
parent 39064bac5e
commit cbd07f213d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/media.php
View File

@ -825,11 +825,12 @@ function wp_media_upload_handler() {
* Download an image from the specified URL and attach it to a post. * Download an image from the specified URL and attach it to a post.
* *
* @since 2.6.0 * @since 2.6.0
* @since 4.2.0 Introduced the `$return` parameter.
* *
* @param string $file The URL of the image to download * @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 int $post_id The post ID the media is to be associated with
* @param string $desc Optional. Description of the image * @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 * @return string|WP_Error Populated HTML img tag on success
*/ */
function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) { function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {

3
wp-includes/post.php
View File

@ -5132,7 +5132,8 @@ function wp_attachment_is( $type, $post_id = 0 ) {
* Checks if the attachment is an image. * Checks if the attachment is an image.
* *
* @since 2.1.0 * @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. * @param int|WP_Post $post Optional. Attachment ID. Default 0.
* @return bool Whether the attachment is an image. * @return bool Whether the attachment is an image.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.