Permalink
Browse files

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer

Conflicts:
	phpBB/includes/functions_install.php
	phpunit.xml.functional
	tests/bootstrap.php
	tests/test_framework/phpbb_functional_test_case.php
	tests/test_framework/phpbb_test_case_helpers.php
  • Loading branch information...
2 parents 13a00ee + cdf7ff1 commit 417caa649a5fb87afa32a8a8f3600b591dddcce0 @naderman naderman committed Apr 21, 2012
Showing with 10 additions and 0 deletions.
  1. +10 −0 phpBB/includes/functions_install.php
@@ -511,6 +511,16 @@ function adjust_language_keys_callback($matches)
}
}
+/**
+* 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
+*
+* @return string The output to write to the file
+*/
function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false)
{
$load_extensions = implode(',', $load_extensions);

0 comments on commit 417caa6

Please sign in to comment.