From: tjhunt <tjhunt>
Date: Tue, 20 Nov 2007 12:41:04 +0000 (+0000)
Subject: MDL-12133 - Errors calling parent::validation in a moodle form subclass because the... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fe93ba838bd2c29bcd361817d5b0a8c2e756459a;p=moodle.git

MDL-12133 - Errors calling parent::validation in a moodle form subclass because the base class method signature was changed. This patch fixes all calls to parent::validation in the question editing forms. Merged from MOODLE_19_STABLE.
---

diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php
index 880603a82a..15aebb338f 100644
--- a/question/type/calculated/edit_calculated_form.php
+++ b/question/type/calculated/edit_calculated_form.php
@@ -171,8 +171,8 @@ class question_edit_calculated_form extends question_edit_form {
         return 'calculated';
     }
 
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
         //verifying for errors in {=...} in question text;
         $qtext = "";
         $qtextremaining = $data['questiontext'] ;
diff --git a/question/type/match/edit_match_form.php b/question/type/match/edit_match_form.php
index e60e10cafd..6ff62c08f0 100644
--- a/question/type/match/edit_match_form.php
+++ b/question/type/match/edit_match_form.php
@@ -70,8 +70,8 @@ class question_edit_match_form extends question_edit_form {
         return 'match';
     }
 
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
         $answers = $data['subanswers'];
         $questions = $data['subquestions'];
         $questioncount = 0;
diff --git a/question/type/missingtype/edit_missingtype_form.php b/question/type/missingtype/edit_missingtype_form.php
index 396f0616e7..c410d46c8a 100644
--- a/question/type/missingtype/edit_missingtype_form.php
+++ b/question/type/missingtype/edit_missingtype_form.php
@@ -66,8 +66,8 @@ class question_edit_missingtype_form extends question_edit_form {
         return 'missingtype';
     }
 
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
         $answers = $data['answer'];
         $answercount = 0;
 
diff --git a/question/type/multianswer/edit_multianswer_form.php b/question/type/multianswer/edit_multianswer_form.php
index c4d8f57ee7..2b7740d099 100644
--- a/question/type/multianswer/edit_multianswer_form.php
+++ b/question/type/multianswer/edit_multianswer_form.php
@@ -190,10 +190,10 @@ class question_edit_multianswer_form extends question_edit_form {
         parent::set_data($question);
     }
 
-    function validation($data){
+    function validation($data, $files){
 
         $errors =array();
-        $parenterrors = parent::validation($data,'');
+        $parenterrors = parent::validation($data, $files);
         if (is_array($parenterrors) && count($parenterrors)) {
             if (is_array($errors)) {
                 $errors = array_merge($errors,$parenterrors);
diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php
index 296cb4ce3c..19dd1eb550 100644
--- a/question/type/multichoice/edit_multichoice_form.php
+++ b/question/type/multichoice/edit_multichoice_form.php
@@ -107,8 +107,8 @@ class question_edit_multichoice_form extends question_edit_form {
         return 'multichoice';
     }
 
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
         $answers = $data['answer'];
         $answercount = 0;
 
diff --git a/question/type/numerical/edit_numerical_form.php b/question/type/numerical/edit_numerical_form.php
index 3b256b0291..9c73168544 100644
--- a/question/type/numerical/edit_numerical_form.php
+++ b/question/type/numerical/edit_numerical_form.php
@@ -107,8 +107,8 @@ class question_edit_numerical_form extends question_edit_form {
         }
         parent::set_data($question);
     }
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
 
         // Check the answers.
         $answercount = 0;
diff --git a/question/type/randomsamatch/edit_randomsamatch_form.php b/question/type/randomsamatch/edit_randomsamatch_form.php
index 6786842384..d746483d7e 100644
--- a/question/type/randomsamatch/edit_randomsamatch_form.php
+++ b/question/type/randomsamatch/edit_randomsamatch_form.php
@@ -47,9 +47,9 @@ class question_edit_randomsamatch_form extends question_edit_form {
         return 'randomsamatch';
     }
 
-    function validation($data){
+    function validation($data, $files){
         global $QTYPES;
-        $errors = parent::validation($data);
+        $errors = parent::validation($data, $files);
         $saquestions = $QTYPES['randomsamatch']->get_sa_candidates($data['category']);
         $numberavailable = count($saquestions);
         if ($saquestions === false){
diff --git a/question/type/shortanswer/edit_shortanswer_form.php b/question/type/shortanswer/edit_shortanswer_form.php
index 38580b7213..6b5fc13fb0 100644
--- a/question/type/shortanswer/edit_shortanswer_form.php
+++ b/question/type/shortanswer/edit_shortanswer_form.php
@@ -69,8 +69,8 @@ class question_edit_shortanswer_form extends question_edit_form {
         }
         parent::set_data($question);
     }
-    function validation($data){
-        $errors = parent::validation($data);
+    function validation($data, $files){
+        $errors = parent::validation($data, $files);
         $answers = $data['answer'];
         $answercount = 0;
         $maxgrade = false;