aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-10-27 23:56:20 -0700
committerNils Adermann <naderman@naderman.de>2014-10-27 23:56:20 -0700
commit087a5363bba7228f29d6075deb2a099cf9d25630 (patch)
tree7a00f16eee724444050f907d800846fd22000ca6 /phpBB
parent3472b6c5bc44b3ca13b6bb3fadc7aef7d7b41f1e (diff)
downloadforums-087a5363bba7228f29d6075deb2a099cf9d25630.tar
forums-087a5363bba7228f29d6075deb2a099cf9d25630.tar.gz
forums-087a5363bba7228f29d6075deb2a099cf9d25630.tar.bz2
forums-087a5363bba7228f29d6075deb2a099cf9d25630.tar.xz
forums-087a5363bba7228f29d6075deb2a099cf9d25630.zip
[ticket/13234-2] Correctly verify that user_id is set in user data array
PHPBB3-13234-2
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/session.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index c787247b44..477e91efd6 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -605,7 +605,7 @@ class session
$result = $db->sql_query($sql);
$user_data = $db->sql_fetchrow($result);
- if ($user_id === false || $user_id == $user_data['user_id'])
+ if ($user_id === false || (isset($user_data['user_id']) && $user_id == $user_data['user_id']))
{
$this->data = $user_data;
$bot = false;
@@ -935,7 +935,7 @@ class session
}
// Reset the data array
- $this->data = false;
+ $this->data = array();
$sql = 'SELECT *
FROM ' . USERS_TABLE . '