aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-03 22:53:18 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-03 22:53:18 +0100
commita4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d (patch)
treee6d56cbe492b74db6e30bb0dea85b9b6a6cd249e
parent9f149e345bb3642a406eeeb3f9c9771809201e89 (diff)
downloadforums-a4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d.tar
forums-a4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d.tar.gz
forums-a4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d.tar.bz2
forums-a4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d.tar.xz
forums-a4d67c55d97598f29c1f5a1e6a8dec4b1e58df6d.zip
[ticket/14957] Make sure config_php_file is set before injecting
PHPBB3-14957
-rw-r--r--phpBB/phpbb/di/container_builder.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index a314def0f3..ac1a1a1733 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -525,6 +525,11 @@ class container_builder
*/
protected function inject_dbal_driver()
{
+ if (empty($this->config_php_file))
+ {
+ return;
+ }
+
$config_data = $this->config_php_file->get_all();
if (!empty($config_data))
{