diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-05-14 21:20:51 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-14 21:20:51 +0200 |
| commit | d72498a9c3006210c49cb1690d079d52593db127 (patch) | |
| tree | 05a63672dec2ed081da2a107989c85ba1649f3ed /phpBB/phpbb/di/container_builder.php | |
| parent | 61fa4f006aa00eb67dd4df8d21f426ce7e53962c (diff) | |
| download | forums-d72498a9c3006210c49cb1690d079d52593db127.tar forums-d72498a9c3006210c49cb1690d079d52593db127.tar.gz forums-d72498a9c3006210c49cb1690d079d52593db127.tar.bz2 forums-d72498a9c3006210c49cb1690d079d52593db127.tar.xz forums-d72498a9c3006210c49cb1690d079d52593db127.zip | |
[ticket/15987] Go back to previous table definition type
This will still allow using the 'tables' parameter array but will also ensure
full backward compatibility and compatibility with extensions that will add
more tables to the 'tables' array.
PHPBB3-15987
Diffstat (limited to 'phpBB/phpbb/di/container_builder.php')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 552b8c7a95..70ceb9b5e3 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -160,7 +160,6 @@ class container_builder { $this->container_extensions = [ new extension\core($this->get_config_path()), - new extension\tables(), ]; if ($this->use_extensions) @@ -168,6 +167,9 @@ class container_builder $this->load_extensions(); } + // Add tables extension after all extensions + $this->container_extensions[] = new extension\tables(); + // Inject the config if ($this->config_php_file) { |