aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-12-10 18:35:28 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-12-10 18:35:28 +0000
commitf988177cb353dc6249829242a8d241e0b8cd21c8 (patch)
tree8cc60b08b57ed1389b6a63d177faa159feee49ca /phpBB/includes
parent5f945443c9cbb00ea5f22b99a3affe154826caf7 (diff)
downloadforums-f988177cb353dc6249829242a8d241e0b8cd21c8.tar
forums-f988177cb353dc6249829242a8d241e0b8cd21c8.tar.gz
forums-f988177cb353dc6249829242a8d241e0b8cd21c8.tar.bz2
forums-f988177cb353dc6249829242a8d241e0b8cd21c8.tar.xz
forums-f988177cb353dc6249829242a8d241e0b8cd21c8.zip
Late fix for #16174
git-svn-id: file:///svn/phpbb/trunk@8273 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6f1d5964f5..bf00beb2e1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2050,11 +2050,11 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg
if ($timespan === false)
{
// we enforce a minimum value of half a minute here.
- $timespan = max(30, $config['form_token_lifetime']);
+ $timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']);
}
if ($minimum_time === false)
{
- $minimum_time = $config['form_token_mintime'];
+ $minimum_time = (int) $config['form_token_mintime'];
}
if (isset($_POST['creation_time']) && isset($_POST['form_token']))