MDL-12133 - Errors calling parent::validation in a moodle form subclass because the...

diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php
index 880603a82a9414b122aa8342b91832124757fc70..15aebb338f561f5d751cc85e5c5cb3e87a959540 100644 (file)
--- 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 e60e10cafdcf35343696ed40c0c3df083e36f8f9..6ff62c08f072503f4d3b97316b2dcba0391e6d83 100644 (file)
--- 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 396f0616e75b5166b79737e6ef3ee4a8313a4610..c410d46c8a1399206ba6c50ebf4152a39b3e8361 100644 (file)
--- 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 c4d8f57ee7cdd9b3274dbb35e5bc3d4a003c8b2c..2b7740d099b375a5e786674b45fef9d999e3d306 100644 (file)
--- 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 296cb4ce3c2143a7e4b21c60e50700801a6d5137..19dd1eb5500c0b67ee4d3144102101848a4da59c 100644 (file)
--- 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 3b256b02918a26e62bdc35a3c6f6e70ce18fd138..9c731685440025766e9371e841afb316fa11723a 100644 (file)
--- 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 6786842384f0a8cfb6e5cb7ea9ddf0b36a4a3f04..d746483d7e68666b863140100d5b9b7d87e27463 100644 (file)
--- 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 38580b7213b2fe2a0b297219d43fa6af232ec2ea..6b5fc13fb0674998b69654b06382d479a2c8bff8 100644 (file)
--- 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;