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

Timestamp:

02/23/2016 10:25:32 PM (10 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.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

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;