diff options
| author | Zoddo <zoddo.ino@gmail.com> | 2015-08-28 18:56:10 +0200 |
|---|---|---|
| committer | Zoddo <zoddo.ino@gmail.com> | 2015-08-28 18:56:10 +0200 |
| commit | af246483e2feb0a8fbfb81782da17fb5f8dda957 (patch) | |
| tree | 30d9e7985d50edfd1a646ee7575c34592d2aec05 | |
| parent | 11b2bffa8e41a37b778019d0aee4041f72f8c0a0 (diff) | |
| download | forums-af246483e2feb0a8fbfb81782da17fb5f8dda957.tar forums-af246483e2feb0a8fbfb81782da17fb5f8dda957.tar.gz forums-af246483e2feb0a8fbfb81782da17fb5f8dda957.tar.bz2 forums-af246483e2feb0a8fbfb81782da17fb5f8dda957.tar.xz forums-af246483e2feb0a8fbfb81782da17fb5f8dda957.zip | |
[ticket/13950] Hide undefined categories
This hides the categories added by disabled extensions
PHPBB3-13950
| -rw-r--r-- | phpBB/includes/acp/auth.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/permissions.php | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 6c13a6694c..52c45499b2 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -1113,6 +1113,11 @@ class auth_admin extends \phpbb\auth\auth @reset($category_array); while (list($cat, $cat_array) = each($category_array)) { + if (!$phpbb_permissions->category_defined($cat)) + { + continue; + } + $template->assign_block_vars($tpl_cat, array( 'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false, 'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false, diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 7006c84b76..42bbe443d1 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -160,6 +160,17 @@ class permissions } /** + * Checks if a category has been defined + * + * @param string $category Identifier of the category + * @return bool True if the category is defined, false otherwise + */ + public function category_defined($category) + { + return isset($this->categories[$category]); + } + + /** * Checks if a permission has been defined * * @param string $permission Identifier of the permission |