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

Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle

Browse Source 
- resolved conflict.
This commit is contained in:
Aparup Banerjee
2011-09-13 13:52:31 +08:00
parent f7dd6bda31 63390481c4
commit 7eae2c5ae2
11 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+3 -1
View File
@@ -1510,7 +1510,9 @@ class global_navigation extends navigation_node {
continue;
}
$url = new moodle_url('/course/category.php', array('id' => $category->id));
$categorynode = $parent->add($category->name, $url, self::TYPE_CATEGORY, $category->name, $category->id);
$context = get_context_instance(CONTEXT_COURSECAT, $category->id);
$categoryname = format_string($category->name, true, array('context' => $context));
$categorynode = $parent->add($categoryname, $url, self::TYPE_CATEGORY, $categoryname, $category->id);
if (empty($category->visible)) {
if (has_capability('moodle/category:viewhiddencategories', get_system_context())) {
$categorynode->hidden = true;