MDL-6826 Removed the optional_param lines at the top, and set the sub…

…mit buttons to PARAM_RAW. Also changed !empty() to isset(); Merging from 1.9
moodle · Feb 6, 2008 · de6f158 · de6f158
1 parent 04b8b68
commit de6f158
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/course/modedit.php b/course/modedit.php
@@ -8,12 +8,10 @@
 
     require_login();
 
-    $add    = optional_param('add', 0, PARAM_ALPHA);
-    $update = optional_param('update', 0, PARAM_INT);
-    $return = optional_param('return', 0, PARAM_BOOL); //return to course/view.php if false or mod/modname/view.php if true
-    $type   = optional_param('type', '', PARAM_ALPHANUM);
-    $submitbutton  = optional_param('submitbutton', null, PARAM_ALPHANUM);
-    $submitbutton2 = optional_param('submitbutton2', null, PARAM_ALPHANUM);
+    $add           = optional_param('add', 0, PARAM_ALPHA);
+    $update        = optional_param('update', 0, PARAM_INT);
+    $return        = optional_param('return', 0, PARAM_BOOL); //return to course/view.php if false or mod/modname/view.php if true
+    $type          = optional_param('type', '', PARAM_ALPHANUM);
 
     if (!empty($add)) {
         $section = required_param('section', PARAM_INT);
@@ -410,7 +408,7 @@
 
         rebuild_course_cache($course->id);
 
-        if (!empty($fromform->submitbutton)) { 
+        if (isset($fromform->submitbutton)) { 
             redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
         } else {
             redirect("$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
@@ -324,6 +324,7 @@ function add_action_buttons($cancel=true, $submitlabel=null, $submit2label=null)
         }
 
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
+        $mform->setType('buttonar', PARAM_RAW);
         $mform->closeHeaderBefore('buttonar');
     }
 }