diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:41 +0200 |
| commit | 3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b (patch) | |
| tree | 2f8cba60d7ebe92c39eea14e558e1aecc02a2ef1 /phpBB/includes/functions.php | |
| parent | 0ba2bfffe2df64e1f67ec23061365cdac2238a34 (diff) | |
| parent | 4dd1bbc5879ae5fcae04341a9152e0366ed68bdd (diff) | |
| download | forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.gz forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.bz2 forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.xz forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.zip | |
Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus
* github-imkingdavid/task/functional:
[task/functional] Fixed DEBUG_TEST related issues
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
[task/functional] Added posting tests (reply and new topic)
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5914831539..8e7e84bf83 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2811,7 +2811,7 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg $diff = time() - $creation_time; // If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)... - if ($diff && ($diff <= $timespan || $timespan === -1)) + if (defined('DEBUG_TEST') || $diff && ($diff <= $timespan || $timespan === -1)) { $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; $key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid); |