From e59ee5e974e3630575fbe005c473caae44429e5f Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Wed, 4 Dec 2013 23:51:19 +0000 Subject: [PATCH] Two more hook docs fixes. `image_memory_limit` filter: * Go with int|string on the limit, and simply notate '256M' as an acceptable string value. `wp_editor_set_quality` filter: * Add a missing parameter description for the mime type. See #25721. Built from https://develop.svn.wordpress.org/trunk@26650 git-svn-id: http://core.svn.wordpress.org/trunk@26540 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-image-editor-gd.php | 4 ++-- wp-includes/class-wp-image-editor.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index b91d6133e9..4ee8be3c0f 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -91,8 +91,8 @@ class WP_Image_Editor_GD extends WP_Image_Editor { * * @since 3.5.0 * - * @param string $limit Maximum memory limit to allocate for images. Default value - * of WP_MAX_MEMORY_LIMIT is '256M'. + * @param int|string $limit Maximum memory limit to allocate for images. Default WP_MAX_MEMORY_LIMIT. + * Accepts an integer (bytes), or a shorthand string notation, such as '256M'. */ // Set artificially high because GD uses uncompressed images in memory @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) ); diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php index 908a11340d..7f6488f91f 100644 --- a/wp-includes/class-wp-image-editor.php +++ b/wp-includes/class-wp-image-editor.php @@ -217,7 +217,8 @@ abstract class WP_Image_Editor { * * @since 3.5.0 * - * @param int $quality Quality level between 1 (low) and 100 (high). + * @param int $quality Quality level between 1 (low) and 100 (high). + * @param string $mime_type Image mime type. */ $quality = apply_filters( 'wp_editor_set_quality', $quality, $this->mime_type );