aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-07 22:17:29 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-07 22:17:29 +0200
commit094a746715f3d91194709a9ebeca30c672fa2795 (patch)
tree150bc97bcfc19ca682395ed7c83abb502be0bc2d /phpBB
parentbe68ce657e8ad7d74a3a2a797e0f1e8c2be487bc (diff)
parent1a56400a45e36bd68df8f9e72bc33c44079bd228 (diff)
downloadforums-094a746715f3d91194709a9ebeca30c672fa2795.tar
forums-094a746715f3d91194709a9ebeca30c672fa2795.tar.gz
forums-094a746715f3d91194709a9ebeca30c672fa2795.tar.bz2
forums-094a746715f3d91194709a9ebeca30c672fa2795.tar.xz
forums-094a746715f3d91194709a9ebeca30c672fa2795.zip
Merge remote-tracking branch 'Elsensee/ticket/12360' into develop-ascraeus
* Elsensee/ticket/12360: [ticket/12360] Fix duplicated creation of session when logging out the user
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/ucp.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 8c773886a6..eaa40a07a2 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -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)
{