diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 16:42:53 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 16:44:42 +0100 |
| commit | 0d296785b2364f894f34171d054341cc4979223f (patch) | |
| tree | b5ae025f4d24c61a34602f7bf9facffca952bfe9 /phpBB/includes/acp | |
| parent | d8e5783e8c341e38a0b8d572c8482b264cacb9c0 (diff) | |
| download | forums-0d296785b2364f894f34171d054341cc4979223f.tar forums-0d296785b2364f894f34171d054341cc4979223f.tar.gz forums-0d296785b2364f894f34171d054341cc4979223f.tar.bz2 forums-0d296785b2364f894f34171d054341cc4979223f.tar.xz forums-0d296785b2364f894f34171d054341cc4979223f.zip | |
[feature/extension-manager] Rename default methods to core methods on finder.
There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.
PHPBB3-10323
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index a4e140ecfe..e51b440d4d 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -544,12 +544,10 @@ class acp_modules $finder = $phpbb_extension_manager->get_finder(); $modules = $finder - ->suffix('_module') - ->directory("/$module_class") - ->default_path("includes/$module_class/info/") - ->default_suffix('') - ->default_prefix($module_class . '_') - ->default_directory('') + ->extension_suffix('_module') + ->extension_directory("/$module_class") + ->core_path("includes/$module_class/info/") + ->core_prefix($module_class . '_') ->get_classes(); foreach ($modules as $module) diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 0c34d02ac7..049a70647f 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -559,11 +559,9 @@ class acp_search $finder = $phpbb_extension_manager->get_finder(); return $finder - ->suffix('_backend') - ->directory('/search') - ->default_path('includes/search/') - ->default_suffix('') - ->default_directory('') + ->extension_suffix('_backend') + ->extension_directory('/search') + ->core_path('includes/search/') ->get_classes(); /* |