diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:59 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:59 +0200 |
| commit | 4fde4abe5511d3d5c4ea423ecc40888b9565e580 (patch) | |
| tree | 4869b286016cc8207d527d885407c849df780a7a /phpBB | |
| parent | d866624ea7cbc4ff8e5515f66dbb984cbd565414 (diff) | |
| parent | 3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b (diff) | |
| download | forums-4fde4abe5511d3d5c4ea423ecc40888b9565e580.tar forums-4fde4abe5511d3d5c4ea423ecc40888b9565e580.tar.gz forums-4fde4abe5511d3d5c4ea423ecc40888b9565e580.tar.bz2 forums-4fde4abe5511d3d5c4ea423ecc40888b9565e580.tar.xz forums-4fde4abe5511d3d5c4ea423ecc40888b9565e580.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ecec1e5e4a..8e19bb1d7d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2821,7 +2821,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); diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 46541acd44..5ff97dc10d 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -522,10 +522,12 @@ function adjust_language_keys_callback($matches) * @param string $dbms The name of the DBAL class to use * @param array $load_extensions Array of additional extensions that should be loaded * @param bool $debug If the debug constants should be enabled by default or not +* @param bool $debug_test If the DEBUG_TEST constant should be added +* NOTE: Only for use within the testing framework * * @return string The output to write to the file */ -function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false) +function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false, $debug_test = false) { $load_extensions = implode(',', $load_extensions); @@ -562,5 +564,10 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = $config_data .= "// @define('DEBUG_EXTRA', true);\n"; } + if ($debug_test) + { + $config_data .= "@define('DEBUG_TEST', true);\n"; + } + return $config_data; } |