L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-34250' of github.com:stronk7/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-08-28 20:44:09 +02:00
parent 2ab9b983be 111938abd9
commit 928dfdee48
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+7 -1
View File
@@ -1131,7 +1131,13 @@ class global_navigation extends navigation_node {
$addedcategories[$category->id] = $categoryparent->add($category->name, $url, self::TYPE_CATEGORY, $category->name, $category->id);
if (!$category->visible) {
if (!has_capability('moodle/category:viewhiddencategories', context_coursecat::instance($category->parent))) {
// Let's decide the context where viewhidden cap checks will happen.
if ($category->parent == '0') {
$contexttocheck = context_system::instance();
} else {
$contexttocheck = context_coursecat::instance($category->parent);
}
if (!has_capability('moodle/category:viewhiddencategories', $contexttocheck)) {
$addedcategories[$category->id]->display = false;
} else {
$addedcategories[$category->id]->hidden = true;