MDL-38631 link categories in My courses only when needed

moodle · Jun 22, 2013 · 2c8e21a · 2c8e21a
1 parent 073a972
commit 2c8e21a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/blocks/navigation/renderer.php b/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) {

diff --git a/lib/ajax/getnavbranch.php b/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