mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-06-05 21:45:47 +02:00
parent 54d8735013 e419c2cd3b
commit 12bff3ca31
6 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/phpbb/di/container_builder.php
View File

@@ -158,13 +158,18 @@ class container_builder
}
else
{
$this->container_extensions = array(new extension\core($this->get_config_path()));
$this->container_extensions = [
new extension\core($this->get_config_path()),
];
if ($this->use_extensions)
{
$this->load_extensions();
}
// Add tables extension after all extensions
$this->container_extensions[] = new extension\tables();
// Inject the config
if ($this->config_php_file)
{