aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-01-28 13:00:10 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-01-28 13:00:10 +0000
commit79b02d160a496a2441d62f8beabfc5ca95499863 (patch)
treed7b1d0397100dbdc804290a7b88a3df615276261 /phpBB/includes
parente13488ab1c4d3a3074feb1fedabf868597ad59e6 (diff)
downloadforums-79b02d160a496a2441d62f8beabfc5ca95499863.tar
forums-79b02d160a496a2441d62f8beabfc5ca95499863.tar.gz
forums-79b02d160a496a2441d62f8beabfc5ca95499863.tar.bz2
forums-79b02d160a496a2441d62f8beabfc5ca95499863.tar.xz
forums-79b02d160a496a2441d62f8beabfc5ca95499863.zip
20255
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8337 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index afc9e810e3..70ffd4ee08 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -653,7 +653,7 @@ class session
$sql = 'SELECT COUNT(session_id) AS sessions
FROM ' . SESSIONS_TABLE . '
WHERE session_user_id = ' . (int) $this->data['user_id'] . '
- AND session_time >= ' . ($this->time_now - $config['form_token_lifetime']);
+ AND session_time >= ' . (int)($this->time_now - (max($config['session_length'], $config['form_token_lifetime'])));
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);