diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-01-28 13:04:49 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-01-28 13:04:49 +0000 |
| commit | e683deeeb8b04e46cc27c4adfb9cfe1272a7461b (patch) | |
| tree | e5bc940dfc3cef892a4e109493caa74e350e7157 | |
| parent | fedee2c07e6cba08c483cf19496cad836d43f133 (diff) | |
| download | forums-e683deeeb8b04e46cc27c4adfb9cfe1272a7461b.tar forums-e683deeeb8b04e46cc27c4adfb9cfe1272a7461b.tar.gz forums-e683deeeb8b04e46cc27c4adfb9cfe1272a7461b.tar.bz2 forums-e683deeeb8b04e46cc27c4adfb9cfe1272a7461b.tar.xz forums-e683deeeb8b04e46cc27c4adfb9cfe1272a7461b.zip | |
merging #20255
git-svn-id: file:///svn/phpbb/trunk@8338 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index f839b1324f..fd3001aa0f 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); |