MDL-6826 merging from 1.9

diff --git a/course/modedit.php b/course/modedit.php
index 9e25d20ef1d5ed9346f857a524969b5540ddce4a..815736e5f4b4598f1861d799d94e8d2e48a22f55 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -409,11 +409,13 @@
         }
 
         rebuild_course_cache($course->id);
-
-        if ($submitbutton) {
-        redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
-        } elseif ($submitbutton2) { 
+        
+        if (!empty($fromform->submitbutton)) { 
+            redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
+        } elseif (!empty($fromform->submitbutton2)) {
             redirect("$CFG->wwwroot/course/view.php?id=$course->id");
+        } else {
+            redirect("$CFG->wwwroot/course/view.php?id=$course->id"); // (ADD) 
         }
         exit;