From 7dfe26dd781e7bd0438041058e2a1d95176e7836 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 1 Sep 2012 10:35:46 -0400
Subject: [task/functional] Allow tests to bypass certain restrictions with
 DEBUG_TEST

PHPBB3-10758
---
 phpBB/includes/functions.php         | 2 +-
 phpBB/includes/functions_install.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB')

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);
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 89dfb7cd2f..2e10db6b24 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -551,10 +551,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);
 
@@ -584,6 +586,7 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
 	{
 		$config_data .= "@define('DEBUG', true);\n";
 		$config_data .= "@define('DEBUG_EXTRA', true);\n";
+		$config_data .= "@define('DEBUG_TEST', true);\n";
 	}
 	else
 	{
-- 
cgit v1.2.1


From 4dd1bbc5879ae5fcae04341a9152e0366ed68bdd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 1 Sep 2012 10:53:01 -0400
Subject: [task/functional] Fixed DEBUG_TEST related issues

PHPBB3-10758
---
 phpBB/includes/functions_install.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB')

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 2e10db6b24..eae136808c 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -586,7 +586,6 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
 	{
 		$config_data .= "@define('DEBUG', true);\n";
 		$config_data .= "@define('DEBUG_EXTRA', true);\n";
-		$config_data .= "@define('DEBUG_TEST', true);\n";
 	}
 	else
 	{
@@ -594,6 +593,11 @@ 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;
 }
 
-- 
cgit v1.2.1