From e4425165ff7b43dc183c01aba023c5b9b0db156a Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sun, 30 Nov 2014 09:59:22 +0000 Subject: [PATCH] Improve the inline documentation for `image_edit_apply_changes()`. Including: * Add a correct type (array) for the `$changes` parameter * Add the `@since` version * Add proper descriptions for both parameters and the return value. Props tillkruess for the initial patch. See #30508. Built from https://develop.svn.wordpress.org/trunk@30644 git-svn-id: http://core.svn.wordpress.org/trunk@30634 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/image-edit.php | 8 +++++--- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php index 05b5068993..7e3e7f7e2d 100644 --- a/wp-admin/includes/image-edit.php +++ b/wp-admin/includes/image-edit.php @@ -403,9 +403,11 @@ function _crop_image_resource($img, $x, $y, $w, $h) { /** * Performs group of changes on Editor specified. * - * @param WP_Image_Editor $image - * @param type $changes - * @return WP_Image_Editor + * @since 2.9.0 + * + * @param WP_Image_Editor $image {@see WP_Image_Editor} instance. + * @param array $changes Array of change operations. + * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied. */ function image_edit_apply_changes( $image, $changes ) { if ( is_resource( $image ) ) diff --git a/wp-includes/version.php b/wp-includes/version.php index 2547c7c11e..517b2995db 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30643'; +$wp_version = '4.1-beta2-30644'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.