Merge branch '46518-28' of git://github.com/samhemelryk/moodle

This commit is contained in:
Dan Poltawski
2014-10-24 15:16:55 +01:00
+4 -3
View File
@@ -2886,10 +2886,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');