fixed closing of popup on saving question which was broken and also added closing...

diff --git a/question/question.php b/question/question.php
index b10f79622cdb712710f7ed3d9c842ba9e130eac4..ccede2d6ffe5265b755339650f58bcd2e81d4c67 100644 (file)
--- a/question/question.php
+++ b/question/question.php
@@ -140,10 +140,15 @@ if ($cm !== null){
 } else {
     $toform->courseid = $COURSE->id;
 }
+$toform->inpopup = $inpopup;
 $mform->set_data($toform);
 
 if ($mform->is_cancelled()){
-    redirect($returnurl);
+    if ($inpopup) {
+        close_window();
+    } else {
+        redirect($returnurl);
+    }
 } elseif ($fromform = $mform->get_data()){
     $returnurl = new moodle_url($returnurl);
     //select category that question has been saved in / moved to when we return to question bank