From e4c19c591f4d5f080359a8aa03feab4374ed9fbf Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 21 May 2015 20:13:25 +0000
Subject: [PATCH] In `bookmark.php`, clarify some `return` docs.

See #32444.

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


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

diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index 47f5d233ab..1e178f436f 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -16,7 +16,7 @@
  * @param int|stdClass $bookmark
  * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
  * @param string $filter Optional, default is 'raw'.
- * @return array|object Type returned depends on $output value.
+ * @return array|object|null Type returned depends on $output value.
  */
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
@@ -65,7 +65,7 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
  * @param string $field The name of the data field to return
  * @param int $bookmark The bookmark ID to get field
  * @param string $context Optional. The context of how the field will be used.
- * @return string
+ * @return string|WP_Error
  */
 function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
 	$bookmark = (int) $bookmark;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0eaa6d1ef3..3d89f8cd92 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32526';
+$wp_version = '4.3-alpha-32527';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.