Changeset 36313 for trunk/src/wp-includes/pluggable.php

Timestamp:

01/15/2016 10:46:38 AM (9 years ago)

Author:

swissspidy

Message:

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

Fixes unit tests affected by [36311].

See #19615.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -63 +63 @@
  * @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() {
@@ -84 +84 @@
         $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;
     }
 
@@ -108 +108 @@
     if ( ! $user_id ) {
         wp_set_current_user( 0 );
-        return false;
+        return $current_user;
     }