Changeset 36651

Timestamp:

02/23/2016 10:25:32 PM (9 years ago)

Author:

swissspidy

Message:

Users: Introduce _wp_get_current_user() for improved backward compatibility.

This new helper function is used by the pluggable functions wp_get_current_user() and get_currentuserinfo(), which was previously being called by the former before [36311]. Without it, infinite loops could be caused when plugins implement these functions, as they are now called the other way around.

Fixes #19615.

Location:

trunk/src/wp-includes

Files:

• pluggable-deprecated.php (modified) (1 diff)
• pluggable.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/src/wp-includes/pluggable-deprecated.php

@@ -49 +49 @@
     _deprecated_function( __FUNCTION__, '4.5', 'wp_get_current_user()' );
 
-    return wp_get_current_user();
+    return _wp_get_current_user();
 }
 endif;

trunk/src/wp-includes/pluggable.php

@@ -66 +66 @@
  */
 function wp_get_current_user() {
-    global $current_user;
-
-    if ( ! empty( $current_user ) ) {
-        if ( $current_user instanceof WP_User ) {
-            return $current_user;
-        }
-
-        // Upgrade stdClass to WP_User
-        if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
-            $cur_id = $current_user->ID;
-            $current_user = null;
-            wp_set_current_user( $cur_id );
-            return $current_user;
-        }
-
-        // $current_user has a junk value. Force to WP_User with ID 0.
-        $current_user = null;
-        wp_set_current_user( 0 );
-        return $current_user;
-    }
-
-    if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-        wp_set_current_user( 0 );
-        return $current_user;
-    }
-
-    /**
-     * Filter the current user.
-     *
-     * The default filters use this to determine the current user from the
-     * request's cookies, if available.
-     *
-     * Returning a value of false will effectively short-circuit setting
-     * the current user.
-     *
-     * @since 3.9.0
-     *
-     * @param int|bool $user_id User ID if one has been determined, false otherwise.
-     */
-    $user_id = apply_filters( 'determine_current_user', false );
-    if ( ! $user_id ) {
-        wp_set_current_user( 0 );
-        return $current_user;
-    }
-
-    wp_set_current_user( $user_id );
-
-    return $current_user;
+    return _wp_get_current_user();
 }
 endif;

trunk/src/wp-includes/user.php

@@ -2407 +2407 @@
     return $users;
 }
+
+/**
+ * Retrieve the current user object.
+ *
+ * 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.
+ *
+ * This function is used by the pluggable functions {@see wp_get_current_user()}
+ * and {@see get_currentuserinfo()}, which is deprecated, for backward compatibility.
+ *
+ * @since 4.5.0
+ * @access private
+ *
+ * @see https://core.trac.wordpress.org/ticket/19615
+ * @global WP_User $current_user Checks if the current user is set.
+ *
+ * @return WP_User Current WP_User instance.
+ */
+function _wp_get_current_user() {
+    global $current_user;
+
+    if ( ! empty( $current_user ) ) {
+        if ( $current_user instanceof WP_User ) {
+            return $current_user;
+        }
+
+        // Upgrade stdClass to WP_User
+        if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+            $cur_id = $current_user->ID;
+            $current_user = null;
+            wp_set_current_user( $cur_id );
+            return $current_user;
+        }
+
+        // $current_user has a junk value. Force to WP_User with ID 0.
+        $current_user = null;
+        wp_set_current_user( 0 );
+        return $current_user;
+    }
+
+    if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
+        wp_set_current_user( 0 );
+        return $current_user;
+    }
+
+    /**
+     * Filter the current user.
+     *
+     * The default filters use this to determine the current user from the
+     * request's cookies, if available.
+     *
+     * Returning a value of false will effectively short-circuit setting
+     * the current user.
+     *
+     * @since 3.9.0
+     *
+     * @param int|bool $user_id User ID if one has been determined, false otherwise.
+     */
+    $user_id = apply_filters( 'determine_current_user', false );
+    if ( ! $user_id ) {
+        wp_set_current_user( 0 );
+        return $current_user;
+    }
+
+    wp_set_current_user( $user_id );
+
+    return $current_user;
+}