Merge branch 'MDL-55993-35' of https://github.com/albertolarah/moodle …

…into MOODLE_35_STABLE
moodle · Sep 4, 2018 · e7dc32a · e7dc32a
2 parents fde541a + 4c51211
commit e7dc32a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -275,7 +275,10 @@ public function show_intro() {
     public function get_return_params() {
         global $PAGE;
 
-        $params = $PAGE->url->params();
+        $params = array();
+        if (!WS_SERVER) {
+            $params = $PAGE->url->params();
+        }
         unset($params['id']);
         unset($params['action']);
         return $params;