From de6f158f2b2d5b316a5e9bd5a2d6a8dcce347631 Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Wed, 6 Feb 2008 10:25:45 +0000
Subject: [PATCH] MDL-6826 Removed the optional_param lines at the top, and set
 the submit buttons to PARAM_RAW. Also changed !empty() to isset(); Merging
 from 1.9

---
 course/modedit.php        | 12 +++++-------
 course/moodleform_mod.php |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/course/modedit.php b/course/modedit.php
index 48f2e55094..f9f022dc55 100644
--- 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
index 0c6ee6c948..ea32390a79 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -324,6 +324,7 @@ class moodleform_mod extends moodleform {
         }
 
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
+        $mform->setType('buttonar', PARAM_RAW);
         $mform->closeHeaderBefore('buttonar');
     }
 }
-- 
2.39.5