diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-10-04 17:30:10 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 20:59:51 +0100 |
| commit | 3a167aa0c3eaec6c4b9d322460480786234e0419 (patch) | |
| tree | c6ce2492fd70a446486880fd3fdf05b28a754859 /phpBB/phpbb/di/container_builder.php | |
| parent | 6cbb60d13f75da6d9b6c6d60555ea119df79b5c0 (diff) | |
| download | forums-3a167aa0c3eaec6c4b9d322460480786234e0419.tar forums-3a167aa0c3eaec6c4b9d322460480786234e0419.tar.gz forums-3a167aa0c3eaec6c4b9d322460480786234e0419.tar.bz2 forums-3a167aa0c3eaec6c4b9d322460480786234e0419.tar.xz forums-3a167aa0c3eaec6c4b9d322460480786234e0419.zip | |
[ticket/12620] Creates one di extension per phpBB extension
PHPBB3-12620
Diffstat (limited to 'phpBB/phpbb/di/container_builder.php')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 45dbaaf303..5ad9336695 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -160,7 +160,17 @@ class container_builder if ($this->use_extensions) { $installed_exts = $this->get_installed_extensions(); - $container_extensions[] = new \phpbb\di\extension\ext($installed_exts); + foreach ($installed_exts as $ext_name => $path) + { + $extension_class = '\\' . str_replace('/', '\\', $ext_name) . '\\di\extension'; + + if (!class_exists($extension_class)) + { + $extension_class = '\phpbb\extension\di\extension_base'; + } + + $container_extensions[] = new $extension_class($ext_name, $path); + } } if ($this->inject_config) |