From 806b2e9baec80fe875d1440f4e458057b28cc596 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 10 Jan 2015 21:38:23 +0000
Subject: [PATCH] `get_post()` takes `$output` as its 2nd param. The `@return`
 annotation should reflect the function's ability to return an array.

See #30799.

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


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

diff --git a/wp-includes/post.php b/wp-includes/post.php
index 692f5d3f63..2257101033 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -416,7 +416,8 @@ function get_extended( $post ) {
  *                            Default OBJECT.
  * @param string      $filter Optional. Type of filter to apply. Accepts 'raw', 'edit', 'db',
  *                            or 'display'. Default 'raw'.
- * @return WP_Post|null WP_Post on success or null on failure.
+ * @return WP_Post|array|null Type corresponding to $output on success or null on failure.
+ *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
 function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
 	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 999902a7e9..5f16dd63ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31131';
+$wp_version = '4.2-alpha-31132';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.