diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/index.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 19cf27940b..f935e3d08c 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -118,7 +118,6 @@ $phpbb_class_loader_ext->register(); $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx); $phpbb_container = $phpbb_container_builder - ->with_config($phpbb_config_php_file) ->without_extensions() ->without_cache() ->without_compiled_container() diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 33eb4e59a8..3886bfdd5d 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -142,7 +142,10 @@ class container_builder } // Inject the config - $this->container_extensions[] = new extension\config($this->config_php_file); + if ($this->config_php_file) + { + $this->container_extensions[] = new extension\config($this->config_php_file); + } $this->container = $this->create_container($this->container_extensions); |