Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle
[moodle.git] / lib / navigationlib.php
index ba729f7..600298b 100644 (file)
@@ -4068,6 +4068,8 @@ class navigation_json {
             $attributes['link'] = $child->action;
         } else if ($child->action instanceof moodle_url) {
             $attributes['link'] = $child->action->out();
+        } else if ($child->action instanceof action_link) {
+            $attributes['link'] = $child->action->url->out();
         }
         $attributes['hidden'] = ($child->hidden);
         $attributes['haschildren'] = ($child->children->count()>0 || $child->type == navigation_node::TYPE_CATEGORY);