sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Users: Always return $current_user in wp_get_current_user(), never a boolean.

Browse Source 
Fixes unit tests affected by [36311].

See #19615.

git-svn-id: https://develop.svn.wordpress.org/trunk@36313 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2016-01-15 10:46:38 +00:00
parent 29147d223a
commit 40c948c1a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/pluggable.php
View File

@ -62,7 +62,7 @@ if ( !function_exists('wp_get_current_user') ) :
* *
* @global WP_User $current_user Checks if the current user is set. * @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() { function wp_get_current_user() {
global $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 has a junk value. Force to WP_User with ID 0.
$current_user = null; $current_user = null;
wp_set_current_user( 0 ); wp_set_current_user( 0 );
return false; return $current_user;
} }
if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) { if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
wp_set_current_user( 0 ); 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 ); $user_id = apply_filters( 'determine_current_user', false );
if ( ! $user_id ) { if ( ! $user_id ) {
wp_set_current_user( 0 ); wp_set_current_user( 0 );
return false; return $current_user;
} }
wp_set_current_user( $user_id ); wp_set_current_user( $user_id );