From 74d4c9e6316cdc1faccf3f3483390d8fc04fed5e Mon Sep 17 00:00:00 2001
From: Jason Fowler <phalacee@gmail.com>
Date: Thu, 13 Sep 2012 12:30:32 +0800
Subject: [PATCH] =?UTF-8?q?MDL-32184=20-=20Course=20-=20Fixing=20incorrect?=
 =?UTF-8?q?=20redirect=20when=20toggling=20course=20edit=20while=20inside?=
 =?UTF-8?q?=20an=20activity=20=E2=80=93=20Patch=20provided=20by=20Kanika?=
 =?UTF-8?q?=20Goyal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 course/view.php       | 3 +++
 lib/navigationlib.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/course/view.php b/course/view.php
index 816265efd18..0b03abe2f59 100644
--- a/course/view.php
+++ b/course/view.php
@@ -17,6 +17,7 @@
     $move        = optional_param('move', 0, PARAM_INT);
     $marker      = optional_param('marker',-1 , PARAM_INT);
     $switchrole  = optional_param('switchrole',-1, PARAM_INT);
+    $return      = optional_param('return', 0, PARAM_LOCALURL);
 
     if (empty($id) && empty($name) && empty($idnumber)) {
         print_error('unspecifycourseid', 'error');
@@ -122,6 +123,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);
             }
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 20f96594b2f..beb3eb9cc62 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -3177,7 +3177,7 @@ class settings_navigation extends navigation_node {
 
         if (has_capability('moodle/course:update', $coursecontext)) {
             // Add the turn on/off settings
-            $url = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey()));
+            $url = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>str_replace($CFG->wwwroot, '', $this->page->url->out(false)), 'sesskey'=>sesskey()));
             if ($this->page->user_is_editing()) {
                 $url->param('edit', 'off');
                 $editstring = get_string('turneditingoff');