From 5c28d1598552830448ea219ab0e813da2a29466f Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 13 Oct 2014 13:21:03 +1300 Subject: [PATCH] MDL-46518 navigation: site glossaries now expand properly --- lib/navigationlib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index d21c5b1465b..767af89b0ff 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2879,10 +2879,11 @@ class global_navigation_for_ajax extends global_navigation { require_course_login($course, true, $cm, false, true); $this->page->set_context(context_module::instance($cm->id)); $coursenode = $this->load_course($course); - if ($course->id != $SITE->id) { - $this->load_course_sections($course, $coursenode, null, $cm); + $this->load_course_sections($course, $coursenode, null, $cm); + $activitynode = $coursenode->find($cm->id, self::TYPE_ACTIVITY); + if ($activitynode) { + $modulenode = $this->load_activity($cm, $course, $activitynode); } - $modulenode = $this->load_activity($cm, $course, $coursenode->find($cm->id, self::TYPE_ACTIVITY)); break; default: throw new Exception('Unknown type'); -- 2.11.4.GIT