diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-21 12:36:40 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-21 12:36:40 +0200 |
| commit | 417caa649a5fb87afa32a8a8f3600b591dddcce0 (patch) | |
| tree | 7f7f03e6d8b22022155593f0f3dc26d97ff28154 | |
| parent | 13a00ee8cb47137908d1cf95c6ad6557cda7a108 (diff) | |
| parent | cdf7ff17974eb20f37b25998036a723ea783a381 (diff) | |
| download | forums-417caa649a5fb87afa32a8a8f3600b591dddcce0.tar forums-417caa649a5fb87afa32a8a8f3600b591dddcce0.tar.gz forums-417caa649a5fb87afa32a8a8f3600b591dddcce0.tar.bz2 forums-417caa649a5fb87afa32a8a8f3600b591dddcce0.tar.xz forums-417caa649a5fb87afa32a8a8f3600b591dddcce0.zip | |
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
| -rw-r--r-- | phpBB/includes/functions_install.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index c1250bac27..15b388728b 100644 --- a/phpBB/includes/functions_install.php +++ b/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); |