1 files changed, 28 insertions, 9 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index a49e19f09a..10ec13669b 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -463,17 +463,21 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 }
 
 /**
-* Removes comments from schema files
+* Removes "/* style" as well as "# style" comments from $input.
+*
+* @param string $input		Input string
+*
+* @return string			Input string with comments removed
 */
-function remove_comments($sql)
+function phpbb_remove_comments($input)
 {
 	// Remove /* */ comments (http://ostermiller.org/findcomment.html)
-	$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
+	$input = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $input);
 
 	// Remove # style comments
-	$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
+	$input = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $input));
 
-	return $sql;
+	return $input;
 }
 
 /**
@@ -511,12 +515,24 @@ function adjust_language_keys_callback($matches)
 	}
 }
 
-function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false)
+/**
+* Creates the output to be stored in a phpBB config.php file
+*
+* @param	array	$data Array containing the database connection information
+* @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, $debug_test = false)
 {
 	$load_extensions = implode(',', $load_extensions);
 
 	$config_data = "<?php\n";
-	$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
+	$config_data .= "// phpBB 3.1.x auto-generated configuration file\n// Do not change anything in this file!\n";
 
 	$config_data_array = array(
 		'dbms'			=> $dbms,
@@ -526,7 +542,7 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
 		'dbuser'		=> $data['dbuser'],
 		'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
 		'table_prefix'	=> $data['table_prefix'],
-		'acm_type'		=> 'file',
+		'acm_type'		=> 'phpbb_cache_driver_file',
 		'load_extensions'	=> $load_extensions,
 	);
 
@@ -548,7 +564,10 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
 		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
 	}
 
-	$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
+	if ($debug_test)
+	{
+		$config_data .= "@define('DEBUG_TEST', true);\n";
+	}
 
 	return $config_data;
 }