Ticket #35488: 35488.1.diff

src/wp-includes/pluggable.php

@@ -568 +568 @@
         function wp_logout() {
                 wp_destroy_current_session();
                 wp_clear_auth_cookie();
+                wp_set_current_user( 0 );
 
                 /**
                  * Fires after a user is logged-out.

tests/phpunit/tests/pluggable.php

@@ -319 +319 @@
                 return $signatures;
         }
 
+        /**
+         * @ticket 35488
+         */
+        function testWpLogoutShouldSetCurrentUserIdToZero() {
+
+                $user_id = self::factory()->user->create();
+
+                wp_set_current_user( $user_id );
+
+                wp_logout();
+
+                $this->assertEquals( 0, get_current_user_id() );
+
+        }
+
 }