Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-21 20:35:00 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Re-clarify the $sizes[ $size ] section of the hash notations for WP_Image_Editor_GD::multi_resize() and WP_Image_Editor_Imagick::multi_resize() as not fully-optional.

Browse Source 
The `$width` value is optional if `$height` is specified, and vice versa. The `$crop` value is always optional and defaults to false.

Props dh-shredder.
See #32246. See [35061] and [35062].

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


git-svn-id: http://core.svn.wordpress.org/trunk@35028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-10-12 16:34:23 +00:00
parent 041e3dd285
commit b1b3fc5deb
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-image-editor-gd.php
View File

@ -219,11 +219,11 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
* maintain aspect ratio according to the provided dimension.
*
* @type array $size {
* Optional. Array of height, width values, and whether to crop.
* Array of height, width values, and whether to crop.
*
* @type int $width Image width.
* @type int $height Image height.
* @type bool $crop Whether to crop the image. Default false.
* @type int $width Image width. Optional if `$height` is specified.
* @type int $height Image height. Optional if `$width` is specified.
* @type bool $crop Optional. Whether to crop the image. Default false.
* }
* }
* @return array An array of resized images' metadata by size.

8
wp-includes/class-wp-image-editor-imagick.php
View File

@ -277,11 +277,11 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
* maintain aspect ratio according to the provided dimension.
*
* @type array $size {
* Optional. Array of height, width values, and whether to crop.
* Array of height, width values, and whether to crop.
*
* @type int $width Image width.
* @type int $height Image height.
* @type bool $crop Whether to crop the image. Default false.
* @type int $width Image width. Optional if `$height` is specified.
* @type int $height Image height. Optional if `$width` is specified.
* @type bool $crop Optional. Whether to crop the image. Default false.
* }
* }
* @return array An array of resized images' metadata by size.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-35062';
$wp_version = '4.4-alpha-35063';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.