Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-29896-m22' of git://github.com/sammarshallou/moodle…

… into MOODLE_22_STABLE
  • Loading branch information...
commit fe3130a07d05c43df7c1b7dd7de6de052f16471d 2 parents 264189d + 125e250
Eloy Lafuente (stronk7) authored January 25, 2012

Showing 1 changed file with 2 additions and 0 deletions. Show diff stats Hide diff stats

  1. 2  lib/navigationlib.php
2  lib/navigationlib.php
@@ -4038,6 +4038,8 @@ protected function convert_child($child, $depth=1) {
4038 4038
             $attributes['link'] = $child->action;
4039 4039
         } else if ($child->action instanceof moodle_url) {
4040 4040
             $attributes['link'] = $child->action->out();
  4041
+        } else if ($child->action instanceof action_link) {
  4042
+            $attributes['link'] = $child->action->url->out();
4041 4043
         }
4042 4044
         $attributes['hidden'] = ($child->hidden);
4043 4045
         $attributes['haschildren'] = ($child->children->count()>0 || $child->type == navigation_node::TYPE_CATEGORY);

0 notes on commit fe3130a

Please sign in to comment.
Something went wrong with that request. Please try again.