makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'bantu/ticket/10417' into develop

Browse source 
* bantu/ticket/10417:
  [ticket/10417] Fix array_merge() on undefined $config variable.
This commit is contained in:
Igor Wiedler 2011-10-17 02:38:20 +02:00
commit 2d42dbc385
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/test_framework/phpbb_test_case_helpers.php
View file

@ -49,16 +49,18 @@ class phpbb_test_case_helpers
static public function get_test_config() static public function get_test_config()
{ {
$config = array();
if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
{ {
$config = array( $config = array_merge($config, array(
'dbms' => 'sqlite', 'dbms' => 'sqlite',
'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
'dbport' => '', 'dbport' => '',
'dbname' => '', 'dbname' => '',
'dbuser' => '', 'dbuser' => '',
'dbpasswd' => '', 'dbpasswd' => '',
); ));
} }
if (file_exists(dirname(__FILE__) . '/../test_config.php')) if (file_exists(dirname(__FILE__) . '/../test_config.php'))