Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12360] Fix duplicated creation of session when logging out the user
This commit is contained in:
Joas Schilling 2014-04-07 22:17:39 +02:00
commit d72922f1a9

View file

@ -94,7 +94,6 @@ switch ($mode)
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)
{