diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-05 21:45:42 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-05 21:45:42 +0200 |
| commit | e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b (patch) | |
| tree | 7f7b043fe5f91c69ea621ca4df18bfc7e22802ed /phpBB/phpbb/di/container_builder.php | |
| parent | 183d1afcaa780f09ae5cd431f9099e01bbf37e80 (diff) | |
| parent | d72498a9c3006210c49cb1690d079d52593db127 (diff) | |
| download | forums-e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b.tar forums-e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b.tar.gz forums-e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b.tar.bz2 forums-e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b.tar.xz forums-e419c2cd3b4f6eb24bb1011d326e1aef01a5c25b.zip | |
Merge pull request #5583 from marc1706/ticket/15987
[ticket/15987] Table parameters as array
Diffstat (limited to 'phpBB/phpbb/di/container_builder.php')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index f2708e6de6..70ceb9b5e3 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -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) { |