diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-01 15:02:20 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-01 15:02:20 -0500 |
| commit | 4670ffe90c221ffc65d9ecca8a98e2bdc888a258 (patch) | |
| tree | d862eb3fabf5f69be5ea1e92c6927c5bdd5d9c0d /phpBB/includes/acp | |
| parent | eb7c8592d93cc6779a00df4338a4cc4293ec11f0 (diff) | |
| parent | e483e3f4591b584aeea32aa5bb2a7be322086287 (diff) | |
| download | forums-4670ffe90c221ffc65d9ecca8a98e2bdc888a258.tar forums-4670ffe90c221ffc65d9ecca8a98e2bdc888a258.tar.gz forums-4670ffe90c221ffc65d9ecca8a98e2bdc888a258.tar.bz2 forums-4670ffe90c221ffc65d9ecca8a98e2bdc888a258.tar.xz forums-4670ffe90c221ffc65d9ecca8a98e2bdc888a258.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11363-2' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363-2:
[ticket/11363] Fix to make get_module_infos get from all extensions
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 52a82004e8..fce26bf45f 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -535,8 +535,14 @@ class acp_modules /** * Get available module information from module files + * + * @param string $module + * @param bool|string $module_class + * @param bool $use_all_available Use all available instead of just all + * enabled extensions + * @return array */ - function get_module_infos($module = '', $module_class = false) + function get_module_infos($module = '', $module_class = false, $use_all_available = false) { global $phpbb_root_path, $phpEx; @@ -556,7 +562,7 @@ class acp_modules ->extension_directory("/$module_class") ->core_path("includes/$module_class/info/") ->core_prefix($module_class . '_') - ->get_classes(); + ->get_classes(true, $use_all_available); foreach ($modules as $module) { |