diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:48:44 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:48:44 -0600 |
| commit | 59638a6a7d873b8ec5b9b2e9e72fdf693bde260a (patch) | |
| tree | a5f2fd9cd7ca5c12b0ad2b12da492458a83dcf09 /phpBB/includes/acp/acp_modules.php | |
| parent | a6f877c0d84ff102d3812246eae7469e191983e2 (diff) | |
| parent | 4670ffe90c221ffc65d9ecca8a98e2bdc888a258 (diff) | |
| download | forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.gz forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.bz2 forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.xz forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386
Conflicts:
phpBB/includes/extension/finder.php
Diffstat (limited to 'phpBB/includes/acp/acp_modules.php')
| -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) { |