diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-30 19:15:38 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 16:15:53 +0200 |
| commit | 482a8c47ea77dcaaa3c0c23c9a141aea583cf24f (patch) | |
| tree | eb64678a554938d8b3238dd6fc914448c7ea0d8a /phpBB | |
| parent | ea46feb11542a9cf54ce083ee0ad03f4c5e02a1e (diff) | |
| download | forums-482a8c47ea77dcaaa3c0c23c9a141aea583cf24f.tar forums-482a8c47ea77dcaaa3c0c23c9a141aea583cf24f.tar.gz forums-482a8c47ea77dcaaa3c0c23c9a141aea583cf24f.tar.bz2 forums-482a8c47ea77dcaaa3c0c23c9a141aea583cf24f.tar.xz forums-482a8c47ea77dcaaa3c0c23c9a141aea583cf24f.zip | |
[feature/extension-manager] Don't use the extension manager during install
Template needs to be able to work without extensions.
PHPBB3-10323
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/template/path_provider.php | 20 | ||||
| -rw-r--r-- | phpBB/install/index.php | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/phpBB/includes/template/path_provider.php b/phpBB/includes/template/path_provider.php index 02d48cbea5..69ac68bdb7 100644 --- a/phpBB/includes/template/path_provider.php +++ b/phpBB/includes/template/path_provider.php @@ -33,7 +33,7 @@ class phpbb_template_path_provider extends phpbb_extension_provider * * @param phpbb_extension_manager $extension_manager phpBB extension manager */ - public function __construct(phpbb_extension_manager $extension_manager) + public function __construct(phpbb_extension_manager $extension_manager = null) { // no super call to avoid find() call $this->extension_manager = $extension_manager; @@ -61,18 +61,20 @@ class phpbb_template_path_provider extends phpbb_extension_provider */ public function find() { - $finder = $this->extension_manager->get_finder(); - $directories = array(); - foreach ($this->templates as $name => $path) + if ($this->extension_manager) { - if ($path && !phpbb_is_absolute($path)) + $finder = $this->extension_manager->get_finder(); + foreach ($this->templates as $name => $path) { - $directories = array_merge($directories, $finder - ->directory('/' . $this->ext_dir_prefix . $path) - ->get_directories() - ); + if ($path && !phpbb_is_absolute($path)) + { + $directories = array_merge($directories, $finder + ->directory('/' . $this->ext_dir_prefix . $path) + ->get_directories() + ); + } } } diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 93effc27f1..abe5d1e485 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -203,7 +203,7 @@ $config = new phpbb_config(array( )); $phpbb_template_locator = new phpbb_template_locator(); -$phpbb_template_path_provider = new phpbb_template_path_provider($phpbb_extension_manager); +$phpbb_template_path_provider = new phpbb_template_path_provider(); $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider); $template->set_ext_dir_prefix('adm/'); $template->set_custom_template('../adm/style', 'admin'); |