Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-32184 - Course - Fixing incorrect redirect when toggling course e…

…dit while inside an activity -- Patch provided by Kanika Goyal
  • Loading branch information...
commit 8cfc92afddefd66d01e5efff2579303b1dc52cda 1 parent 9273bd1
@jsnfwlr jsnfwlr authored
Showing with 6 additions and 1 deletion.
  1. +5 −0 course/view.php
  2. +1 −1  lib/navigationlib.php
View
5 course/view.php
@@ -20,6 +20,7 @@
$marker = optional_param('marker',-1 , PARAM_INT);
$switchrole = optional_param('switchrole',-1, PARAM_INT);
$modchooser = optional_param('modchooser', -1, PARAM_BOOL);
+ $return = optional_param('return', 0, PARAM_LOCALURL);
$params = array();
if (!empty($name)) {
@@ -139,6 +140,8 @@
// Redirect to site root if Editing is toggled on frontpage
if ($course->id == SITEID) {
redirect($CFG->wwwroot .'/?redirect=0');
+ } else if (!empty($return)) {
+ redirect($CFG->wwwroot . $return);
} else {
$url = new moodle_url($PAGE->url, array('notifyeditingon' => 1));
redirect($url);
@@ -152,6 +155,8 @@
// Redirect to site root if Editing is toggled on frontpage
if ($course->id == SITEID) {
redirect($CFG->wwwroot .'/?redirect=0');
+ } else if (!empty($return)) {
+ redirect($CFG->wwwroot . $return);
} else {
redirect($PAGE->url);
}
View
2  lib/navigationlib.php
@@ -3561,7 +3561,7 @@ protected function load_course_settings($forceopen = false) {
$baseurl->param('sesskey', sesskey());
} else {
// Edit on the main course page.
- $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey()));
+ $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>$this->page->url->out_as_local_url(false), 'sesskey'=>sesskey()));
}
$editurl = clone($baseurl);
Please sign in to comment.
Something went wrong with that request. Please try again.