From 50fd2488f40de3ba51d3e1959bd7549fcd1a222a Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 12 Oct 2015 15:29:24 +0000
Subject: [PATCH] Docs: Adjust documentation for the `$size` parameter in
 `image_get_intermediate_size()` to clarify the required order of width and
 height values when passing an array.

See #34257.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media.php   | 5 +++--
 wp-includes/version.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index c5c0949215..71505aee0f 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -604,8 +604,9 @@ function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
  * @since 2.5.0
  *
  * @param int          $post_id Attachment ID.
- * @param array|string $size    Optional. Registered image size to retrieve or flat array of height
- *                              and width dimensions. Default 'thumbnail'.
+ * @param array|string $size    Optional. Image size. Accepts any valid image size, or an array
+ *                              of width and height values in pixels (in that order).
+ *                              Default 'thumbnail'.
  * @return false|array False on failure or array of file path, width, and height on success.
  */
 function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ed6f64bd11..feead7ede7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35038';
+$wp_version = '4.4-alpha-35039';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.