Ticket #19615: 19615.2.diff

wp-includes/pluggable-deprecated.php

@@ -36 +36 @@
 }
 endif;
 
+if ( !function_exists('get_currentuserinfo') ) :
+/**
+ * Populate global variables with information about the currently logged in user.
+ *
+ * @since 0.71
+ *
+ * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
+ */
+function get_currentuserinfo() {
+        _deprecated_function( __FUNCTION__, '3.4', 'wp_get_current_user()' );
+
+        return wp_get_current_user();
+}
+endif;
+
 if ( !function_exists('get_userdatabylogin') ) :
 /**
  * Retrieve user info by login name.

wp-includes/pluggable.php

@@ -44 +44 @@
 /**
  * Retrieve the current user object.
  *
- * @since 2.0.3
- *
- * @return WP_User Current user WP_User object
- */
-function wp_get_current_user() {
-        global $current_user;
-
-        get_currentuserinfo();
-
-        return $current_user;
-}
-endif;
-
-if ( !function_exists('get_currentuserinfo') ) :
-/**
- * Populate global variables with information about the currently logged in user.
- *
  * Will set the current user, if the current user is not set. The current user
  * will be set to the logged in person. If no user is logged in, then it will
  * set the current user to 0, which is invalid and won't have any permissions.
  *
- * @since 0.71
- * @uses $current_user Checks if the current user is set
+ * @since 2.0.3
+ *
  * @uses wp_validate_auth_cookie() Retrieves current logged in user.
  *
- * @return bool|null False on XMLRPC Request and invalid auth cookie. Null when current user set
+ * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
  */
-function get_currentuserinfo() {
+function wp_get_current_user() {
         global $current_user;
 
         if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
                 return false;
 
-        if ( ! empty($current_user) )
-                return;
+        if ( ! empty( $current_user ) )
+                return $current_user;
 
         if ( ! $user = wp_validate_auth_cookie() ) {
                  if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
@@ -88 +71 @@
         }
 
         wp_set_current_user($user);
+
+        return $current_user;
 }
 endif;