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

Docs: Adjust documentation for the `$size` parameter in `wp_get_attachment_link()` to clarify the required order of width and height values when passing an array. 

Also adds the `array` type to the parameter documentation (already supported).

Props jaspermdegroot.
See #34257.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-10-12 15:56:24 +00:00
parent d0a392a34c
commit 69a3c2d8d7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/post-template.php
View File

@ -1402,7 +1402,9 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $
* @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object. * @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object.
* *
* @param int|WP_Post $id Optional. Post ID or post object. * @param int|WP_Post $id Optional. Post ID or post object.
* @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. * @param string|array $size Optional. Image size. Accepts any valid image size, or an array
* of width and height values in pixels (in that order).
* Default 'thumbnail'.
* @param bool $permalink Optional, default is false. Whether to add permalink to image. * @param bool $permalink Optional, default is false. Whether to add permalink to image.
* @param bool $icon Optional, default is false. Whether to include icon. * @param bool $icon Optional, default is false. Whether to include icon.
* @param string|bool $text Optional, default is false. If string, then will be link text. * @param string|bool $text Optional, default is false. If string, then will be link text.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35049'; $wp_version = '4.4-alpha-35050';
/** /**
* 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.