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

Merge branch 'ticket/14957' into ticket/14957-rhea

Browse source
This commit is contained in:
Marc Alexander 2017-01-03 22:22:46 +01:00
commit 9f149e345b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/phpbb/di/container_builder.php
View file

@ -525,7 +525,8 @@ class container_builder
*/ */
protected function inject_dbal_driver() protected function inject_dbal_driver()
{ {
if (!empty($this->config_php_file) && !empty($this->config_php_file->get_all())) $config_data = $this->config_php_file->get_all();
if (!empty($config_data))
{ {
if ($this->dbal_connection === null) if ($this->dbal_connection === null)
{ {

1
tests/test_framework/phpbb_functional_test_case.php
View file

@ -304,6 +304,7 @@ class phpbb_functional_test_case extends phpbb_test_case
], ],
'cache.driver.class' => 'phpbb\cache\driver\file' 'cache.driver.class' => 'phpbb\cache\driver\file'
]) ])
->with_config(new \phpbb\config_php_file($phpbb_root_path, $phpEx))
->without_compiled_container() ->without_compiled_container()
->get_container(); ->get_container();