diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:07 +0200 |
| commit | 9842137028f70a2b48ea4eaaddd710cbcf7dc8d5 (patch) | |
| tree | b050cc5a6ca4a4b048e07d93271ca79924fc9664 /phpBB/phpbb/extension/manager.php | |
| parent | 0aa6381834724e9d56d15a11b608b3c0c45e4d37 (diff) | |
| parent | 0134acd53fb93ef64b60504ac73e20dc27910578 (diff) | |
| download | forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.gz forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.bz2 forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.xz forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12508' into develop-ascraeus
* github-nickvergessen/ticket/12508:
[ticket/12508] Ignore extensions in migration_tips dev tool
[ticket/12508] Fix doc block
[ticket/12508] Add new line to separate the if and foreach better
[ticket/12508] Add a unit test for set_extensions()
[ticket/12508] Only take a list of names for set_extensions()
[ticket/12508] Fix class doc block
[ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
[ticket/12508] Fix usages of the finder
[ticket/12508] Remove extension manager from finder
Diffstat (limited to 'phpBB/phpbb/extension/manager.php')
| -rw-r--r-- | phpBB/phpbb/extension/manager.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index cd7289e085..b83bb1b189 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -532,12 +532,22 @@ class manager } /** - * Instantiates a \phpbb\extension\finder. + * Instantiates a \phpbb\finder. * - * @return \phpbb\extension\finder An extension finder instance + * @param bool $use_all_available Should we load all extensions, or just enabled ones + * @return \phpbb\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\finder($this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); + if ($use_all_available) + { + $finder->set_extensions(array_keys($this->all_available())); + } + else + { + $finder->set_extensions(array_keys($this->all_enabled())); + } + return $finder; } } |