MDL-29678 navigation: Navigation AJAX require_login calls no longer set wantsurl or redirect

This commit is contained in:
Sam Hemelryk 2012-03-27 11:32:09 +13:00
parent a280078197
commit 04bcd1ce39

View File

@ -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) {