diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 17:50:46 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-10 11:47:39 +0200 |
commit | d45c681b40cf0415ce49b2cd7f3f1083e84b367c (patch) | |
tree | ce42a1665c9ffa1c519964ad0df9bf6d502c1afa /phpBB/phpbb | |
parent | c20653dfbe552b53fa3281ff8f2a9214fc8a26a9 (diff) | |
download | forums-d45c681b40cf0415ce49b2cd7f3f1083e84b367c.tar forums-d45c681b40cf0415ce49b2cd7f3f1083e84b367c.tar.gz forums-d45c681b40cf0415ce49b2cd7f3f1083e84b367c.tar.bz2 forums-d45c681b40cf0415ce49b2cd7f3f1083e84b367c.tar.xz forums-d45c681b40cf0415ce49b2cd7f3f1083e84b367c.zip |
[ticket/12508] Fix usages of the finder
PHPBB3-12508
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/extension/manager.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index cd7289e085..88404b025e 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -534,10 +534,20 @@ class manager /** * Instantiates a \phpbb\extension\finder. * + * @param bool $use_all_available Should we load all extensions, or just enabled ones * @return \phpbb\extension\finder An extension finder instance */ - public function get_finder() + public function get_finder($use_all_available = false) { - return new \phpbb\extension\finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); + $finder = new \phpbb\extension\finder($this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); + if ($use_all_available) + { + $finder->set_extensions($this->all_available()); + } + else + { + $finder->set_extensions($this->all_enabled()); + } + return $finder; } } |