aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/controller
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-06-10 18:40:07 +0200
committerNils Adermann <naderman@naderman.de>2014-06-10 18:40:07 +0200
commit9842137028f70a2b48ea4eaaddd710cbcf7dc8d5 (patch)
treeb050cc5a6ca4a4b048e07d93271ca79924fc9664 /phpBB/phpbb/controller
parent0aa6381834724e9d56d15a11b608b3c0c45e4d37 (diff)
parent0134acd53fb93ef64b60504ac73e20dc27910578 (diff)
downloadforums-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/controller')
-rw-r--r--phpBB/phpbb/controller/provider.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 91f3a07fb1..bd85385a41 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -46,10 +46,10 @@ class provider
}
/**
- * @param \phpbb\extension\finder $finder
+ * @param \phpbb\finder $finder
* @return null
*/
- public function find_routing_files(\phpbb\extension\finder $finder)
+ public function find_routing_files(\phpbb\finder $finder)
{
// We hardcode the path to the core config directory
// because the finder cannot find it