Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'wip-MDL-38631-master' of git://github.com/marinaglancy/…

…moodle
  • Loading branch information...
commit 0b20ce2841d7b718c512171cc8afae4427467331 2 parents ef03bb6 + 3b42c97
@samhemelryk samhemelryk authored
View
4 blocks/navigation/renderer.php
@@ -105,7 +105,9 @@ protected function navigation_node($items, $attrs=array(), $expansionlimit=null,
if ($item->hidden) {
$attributes['class'] = 'dimmed_text';
}
- if (is_string($item->action) || empty($item->action) || ($item->type === navigation_node::TYPE_CATEGORY && empty($options['linkcategories']))) {
+ if (is_string($item->action) || empty($item->action) ||
+ (($item->type === navigation_node::TYPE_CATEGORY || $item->type === navigation_node::TYPE_MY_CATEGORY) &&
+ empty($options['linkcategories']))) {
$attributes['tabindex'] = '0'; //add tab support to span but still maintain character stream sequence.
$content = html_writer::tag('span', $content, $attributes);
} else if ($item->action instanceof action_link) {
View
3  lib/ajax/getnavbranch.php
@@ -103,6 +103,9 @@
foreach ($branch->find_all_of_type(navigation_node::TYPE_CATEGORY) as $category) {
$category->action = null;
}
+ foreach ($branch->find_all_of_type(navigation_node::TYPE_MY_CATEGORY) as $category) {
+ $category->action = null;
+ }
}
// Stop buffering errors at this point
View
2  lib/navigationlib.php
@@ -2652,7 +2652,7 @@ protected function load_courses_enrolled() {
list($sql, $params) = $DB->get_in_or_equal($categoryids);
$categories = $DB->get_recordset_select('course_categories', 'id '.$sql.' AND parent = 0', $params, 'sortorder, id');
foreach ($categories as $category) {
- $this->add_category($category, $this->rootnodes['mycourses']);
+ $this->add_category($category, $this->rootnodes['mycourses'], self::TYPE_MY_CATEGORY);
}
$categories->close();
} else {
Please sign in to comment.
Something went wrong with that request. Please try again.