From 9cd32c7f6c9d27954c49ac444caa3cbd986a3026 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 23 Jul 2015 07:45:25 +0000
Subject: [PATCH] Docs: Correct the possible return types and corresponding
 descriptions for `wp_get_post_terms()`.

Props adamkheckler for the initial patch.
Fixes #32950.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33361 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 38df3019e6..ff332e2196 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -3013,7 +3013,8 @@ function wp_get_post_tags( $post_id = 0, $args = array() ) {
  *                         global $post. Default 0.
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @param array  $args     Optional. {@link wp_get_object_terms()} arguments. Default empty array.
- * @return array List of post tags.
+ * @return array|WP_Error  List of post terms or empty array if no terms were found. WP_Error object
+ *                         if `$taxonomy` doesn't exist.
  */
 function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
 	$post_id = (int) $post_id;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8052f7b4a2..dd088a3777 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33392';
+$wp_version = '4.3-beta4-33393';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.