Changeset 46467

Timestamp:

10/12/2019 03:08:56 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Users: Make sure wp_logout() clears current user, so that a subsequent call to is_user_logged_in() works as expected.

Props sebastian.pisula, donmhico, roytanck, juliobox.
Fixes #35488.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -572 +572 @@
         wp_destroy_current_session();
         wp_clear_auth_cookie();
+        wp_set_current_user( 0 );
 
         /**

trunk/tests/phpunit/tests/user/capabilities.php

@@ -1751 +1751 @@
      */
     function test_cpt_with_page_capability_type() {
-
         register_post_type(
             'page_capability',
@@ -1800 +1799 @@
     }
 
-    public function testNonLoggedInUsersHaveNoCapabilities() {
-
+    public function test_non_logged_in_users_have_no_capabilities() {
         $this->assertFalse( is_user_logged_in() );
 
@@ -1817 +1815 @@
         $this->assertFalse( current_user_can( 'do_not_allow' ), 'Non-logged-in user should not have the do_not_allow capability' );
     }
+
+    /**
+     * @ticket 35488
+     */
+    function test_wp_logout_should_clear_current_user() {
+        $user_id = self::factory()->user->create();
+        wp_set_current_user( $user_id );
+
+        wp_logout();
+
+        $this->assertEquals( 0, get_current_user_id() );
+
+    }
+
 
     protected $_role_test_wp_roles_role;