From 9cd880d356aaa71468c5e130d9bd26488bd1f6ae Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Fri, 15 Jan 2016 10:47:25 +0000
Subject: [PATCH] Users: Always return `$current_user` in
 `wp_get_current_user()`, never a boolean.

Fixes unit tests affected by [36311].

See #19615.
Built from https://develop.svn.wordpress.org/trunk@36313


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

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 50f626dfcc..d5d03546ee 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -62,7 +62,7 @@ if ( !function_exists('wp_get_current_user') ) :
  *
  * @global WP_User $current_user Checks if the current user is set.
  *
- * @return bool|WP_User WP_User instance on success, false on XMLRPC Request and invalid auth cookie.
+ * @return bool Current WP_User instance.
  */
 function wp_get_current_user() {
 	global $current_user;
@@ -83,12 +83,12 @@ function wp_get_current_user() {
 		// $current_user has a junk value. Force to WP_User with ID 0.
 		$current_user = null;
 		wp_set_current_user( 0 );
-		return false;
+		return $current_user;
 	}
 
 	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
 		wp_set_current_user( 0 );
-		return false;
+		return $current_user;
 	}
 
 	/**
@@ -107,7 +107,7 @@ function wp_get_current_user() {
 	$user_id = apply_filters( 'determine_current_user', false );
 	if ( ! $user_id ) {
 		wp_set_current_user( 0 );
-		return false;
+		return $current_user;
 	}
 
 	wp_set_current_user( $user_id );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0422d06dfe..69f8bbda3e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36312';
+$wp_version = '4.5-alpha-36313';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.