From e4f9e334ea8fc90886639aee96d50cfd444ebbac Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 12 Oct 2015 15:43:25 +0000 Subject: [PATCH] Docs: Adjust documentation for the `$size` argument in `gallery_shortcode` to clarify the required order of width and height values when passing an array. Also adds the `array` type to the argument documentation. Props jaspermdegroot. See #34257. Built from https://develop.svn.wordpress.org/trunk@35045 git-svn-id: http://core.svn.wordpress.org/trunk@35010 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/media.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/media.php b/wp-includes/media.php index c8bb9167f6..0c82380fb7 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1388,7 +1388,8 @@ add_shortcode('gallery', 'gallery_shortcode'); * @type string $captiontag HTML tag to use for each image's caption. * Default 'dd', or 'figcaption' when the theme registers HTML5 gallery support. * @type int $columns Number of columns of images to display. Default 3. - * @type string $size Size of the images to display. Default 'thumbnail'. + * @type string|array $size Size of the images to display. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'thumbnail'. * @type string $ids A comma-separated list of IDs of attachments to display. Default empty. * @type string $include A comma-separated list of IDs of attachments to include. Default empty. * @type string $exclude A comma-separated list of IDs of attachments to exclude. Default empty. diff --git a/wp-includes/version.php b/wp-includes/version.php index 697986e799..963edb140f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35044'; +$wp_version = '4.4-alpha-35045'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.