[6.x] Fix logout() when using AuthenticateSession and default guard

murrant · murrant · commit 8224bf3c1a4a · 2021-10-16T22:52:34.000-05:00
Fix was attempted by laravel#826, but the string concatenation is wrong and it never uses the default guard.
diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
@@ -58,7 +58,7 @@ public function logout($guard = null)
     {
         Auth::guard($guard ?: config('auth.defaults.guard'))->logout();
 
-        Session::forget('password_hash_'.$guard ?: config('auth.defaults.guard'));
+        Session::forget('password_hash_' . ($guard ?: config('auth.defaults.guard')));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function logout($guard = null)`
`58`	`58`	`{`
`59`	`59`	`Auth::guard($guard ?: config('auth.defaults.guard'))->logout();`
`60`	`60`
`61`		`- Session::forget('password_hash_'.$guard ?: config('auth.defaults.guard'));`
	`61`	`+ Session::forget('password_hash_' . ($guard ?: config('auth.defaults.guard')));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`