diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:12:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:12:39 +0100 |
| commit | 70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6 (patch) | |
| tree | 01968c9cd58e6d7c3e3256476fd827f278f6e665 | |
| parent | 864953ebff457c15f5a62f3f9c469b3293190a36 (diff) | |
| parent | c6746ab3cd02b4c8a05895c334a3f812a5a5c5b1 (diff) | |
| download | forums-70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6.tar forums-70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6.tar.gz forums-70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6.tar.bz2 forums-70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6.tar.xz forums-70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6.zip | |
Merge pull request #4615 from marc1706/ticket/14946
[ticket/14946] Make sure to pass integers to max()
| -rw-r--r-- | phpBB/phpbb/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index cbe2f02851..cc200b1adc 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -838,7 +838,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 >= ' . (int) ($this->time_now - (max($config['session_length'], $config['form_token_lifetime']))); + AND session_time >= ' . (int) ($this->time_now - (max((int) $config['session_length'], (int) $config['form_token_lifetime']))); $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); |