Merge branch 'MDL-53440-master' of git://github.com/cameron1729/moodle

moodle · Apr 11, 2016 · d532702 · d532702
2 parents c62fa3c + 1b276bf
commit d532702
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/course/edit.php b/course/edit.php
@@ -55,6 +55,9 @@
             case 'topcat':
                 $returnurl = new moodle_url($CFG->wwwroot . '/course/');
                 break;
+            case 'pending':
+                $returnurl = new moodle_url($CFG->wwwroot . '/course/pending.php');
+                break;
         }
     }
 }

diff --git a/course/pending.php b/course/pending.php
@@ -51,7 +51,7 @@
     $courseid = $course->approve();
 
     if ($courseid !== false) {
-        redirect($CFG->wwwroot.'/course/edit.php?id=' . $courseid);
+        redirect(new moodle_url('/course/edit.php', ['id' => $courseid, 'returnto' => 'pending']));
     } else {
         print_error('courseapprovedfailed');
     }