From 04bcd1ce39aa0dbfe034b36fd3d94a14608298a7 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Tue, 27 Mar 2012 11:32:09 +1300 Subject: [PATCH] MDL-29678 navigation: Navigation AJAX require_login calls no longer set wantsurl or redirect --- lib/navigationlib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 45ef60e491a..5d2890c5e28 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2643,7 +2643,7 @@ class global_navigation_for_ajax extends global_navigation { break; case self::TYPE_COURSE : $course = $DB->get_record('course', array('id' => $this->instanceid), '*', MUST_EXIST); - require_course_login($course); + require_course_login($course, true, null, false, true); $this->page->set_context(get_context_instance(CONTEXT_COURSE, $course->id)); $coursenode = $this->add_course($course); $this->add_course_essentials($coursenode, $course); @@ -2657,7 +2657,7 @@ class global_navigation_for_ajax extends global_navigation { LEFT JOIN {course_sections} cs ON cs.course = c.id WHERE cs.id = ?'; $course = $DB->get_record_sql($sql, array($this->instanceid), MUST_EXIST); - require_course_login($course); + require_course_login($course, true, null, false, true); $this->page->set_context(get_context_instance(CONTEXT_COURSE, $course->id)); $coursenode = $this->add_course($course); $this->add_course_essentials($coursenode, $course); @@ -2674,7 +2674,7 @@ class global_navigation_for_ajax extends global_navigation { $course = $DB->get_record_sql($sql, $params, MUST_EXIST); $modinfo = get_fast_modinfo($course); $cm = $modinfo->get_cm($this->instanceid); - require_course_login($course, true, $cm); + require_course_login($course, true, $cm, false, true); $this->page->set_context(get_context_instance(CONTEXT_MODULE, $cm->id)); $coursenode = $this->load_course($course); if ($course->id == SITEID) {