[ticket/12360] Fix duplicated creation of session when logging out the user

Elsensee · Elsensee · commit 1a56400a45e3 · 2014-04-06T23:49:20.000+02:00
In 7d8b578 this line was introduced to fix a bug with style.php. Later since 1d42d1b a new session is always created after killing the old one. This causes a duplicated creation of the session everytime the user logs itself out. PHPBB3-12360
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
@@ -94,7 +94,6 @@
 		if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id)
 		{
 			$user->session_kill();
-			$user->session_begin();
 		}
 		else if ($user->data['user_id'] != ANONYMOUS)
 		{

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@`
`94`	`94`	`if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id)`
`95`	`95`	`{`
`96`	`96`	`$user->session_kill();`
`97`		`- $user->session_begin();`
`98`	`97`	`}`
`99`	`98`	`else if ($user->data['user_id'] != ANONYMOUS)`
`100`	`99`	`{`