MDL-8166 some forgotten set_defaults converted to set_data

diff --git a/course/import/activities/import_form.php b/course/import/activities/import_form.php
index 3a6d0779f7a7b61a7fd5a673e1798a7a1184886f..4d0075413a245c9a1612a619bf81a1406db9a8b7 100755 (executable)
--- a/course/import/activities/import_form.php
+++ b/course/import/activities/import_form.php
@@ -12,7 +12,7 @@ class course_import_activities_form_1 extends moodleform {
                $options = $this->_customdata['options'];
         $courseid = $this->_customdata['courseid'];
         $mform->addElement('header', 'general', '');//fill in the data depending on page params
-                                                    //later using set_defaults
+                                                    //later using set_data
                $mform->addElement('select', 'fromcourse', $text, $options);
 
         // buttons
@@ -40,7 +40,7 @@ class course_import_activities_form_2 extends moodleform {
                $courseid = $this->_customdata['courseid'];
 
         $mform->addElement('header', 'general', '');//fill in the data depending on page params
-                                                    //later using set_defaults
+                                                    //later using set_data
                $mform->addElement('text', 'fromcoursesearch', get_string('searchcourses'));
 
         // buttons

diff --git a/course/import/groups/import_form.php b/course/import/groups/import_form.php
index 8391f7fd2e15510d1feb85b606485dc425c9c4da..4c327dc183371536ea24bc9f5284c9cb34dc465e 100755 (executable)
--- a/course/import/groups/import_form.php
+++ b/course/import/groups/import_form.php
@@ -15,7 +15,7 @@ class course_import_groups_form extends moodleform {
         //$this->set_max_file_size('', $maxuploadsize);
 
         $mform->addElement('header', 'general', '');//fill in the data depending on page params
-                                                    //later using set_defaults
+                                                    //later using set_data
         // buttons
 
         $mform->addElement('hidden', 'sesskey');

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 27ae6204b621a5afae86dabdd7f24dc1a34e2a18..f0176f657e7933e918eb34db300b9e9fe8cfc30e 100644 (file)
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -51,12 +51,12 @@ class moodleform_mod extends moodleform {
      *
      * @param mixed $default_values object or array of default values
      */
-    function set_defaults($default_values) {
+    function set_data($default_values) {
         if (is_object($default_values)) {
             $default_values = (array)$default_values;
         }
         $this->defaults_preprocessing($default_values);
-        parent::set_defaults($default_values + $this->standard_coursemodule_elements_settings());//never slashed for moodleform_mod
+        parent::set_data($default_values + $this->standard_coursemodule_elements_settings());//never slashed for moodleform_mod
     }
     /**
      * Adds all the standard elements to a form to edit the settings for an activity module.

diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php
index 519d71a8724a047ebd39ce7fe8bf1691b6493745..503c712099a1ee2e3707e7d8908e0fd13c770baf 100644 (file)
--- a/mod/forum/post_form.php
+++ b/mod/forum/post_form.php
@@ -20,7 +20,7 @@ class mod_forum_post_form extends moodleform {
         $this->set_upload_manager(new upload_manager('attachment', true, false, $course, false, $forum->maxbytes, true, true));
 
         $mform->addElement('header', 'general', '');//fill in the data depending on page params
-                                                    //later using set_defaults
+                                                    //later using set_data
                $mform->addElement('text', 'subject', get_string('subject', 'forum'), 'size="64"');
                $mform->setType('subject', PARAM_TEXT);
                $mform->addRule('subject', get_string('required'), 'required', null, 'client');

diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php
index e698271235537d0ea552f386098a289ed434716d..693c4cb6f5122f7ef541c60f0002c53809dea046 100644 (file)
--- a/question/type/calculated/edit_calculated_form.php
+++ b/question/type/calculated/edit_calculated_form.php
@@ -124,7 +124,7 @@ class question_edit_calculated_form extends question_edit_form {
 
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $answers = $question->options->answers;
             if (count($answers)) {
@@ -156,7 +156,7 @@ class question_edit_calculated_form extends question_edit_form {
             $question = (object)((array)$question + $default_values);
         }
 
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/edit_question_form.php b/question/type/edit_question_form.php
index 610695ad60af8123b48473dbf5a1b54a9a555e8d..b02b322bca4da3f37a3bfaf5e51ca2accec92dbd 100644 (file)
--- a/question/type/edit_question_form.php
+++ b/question/type/edit_question_form.php
@@ -18,7 +18,7 @@ class question_edit_form extends moodleform {
     /**
      * Question object with options and answers already loaded by get_question_options
      * Be careful how you use this it is needed sometimes to set up the structure of the
-     * form in definition_inner but data is always loaded into the form with set_defaults.
+     * form in definition_inner but data is always loaded into the form with set_data.
      *
      * @var object
      */
@@ -127,13 +127,13 @@ class question_edit_form extends moodleform {
         // By default, do nothing.
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         global $QTYPES;
         $QTYPES[$question->qtype]->set_default_options($question);
         if (empty($question->image)){
             unset($question->image);
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     /**

diff --git a/question/type/essay/edit_essay_form.php b/question/type/essay/edit_essay_form.php
index d99cb82c297e67b54de9f60762e42a3b87eb7f9d..dcb6381a2dfe1fd601db8f444e101a2d768babb6 100644 (file)
--- a/question/type/essay/edit_essay_form.php
+++ b/question/type/essay/edit_essay_form.php
@@ -24,11 +24,11 @@ class question_edit_essay_form extends question_edit_form {
         $mform->addElement('hidden', 'fraction', 0);
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $question->feedback = $question->options->answer->feedback;
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/match/edit_match_form.php b/question/type/match/edit_match_form.php
index 3684075d85c298f566a8308b24ff5b5d11884554..9fc4a5f288f27f6bc3495e91cfecb90b5c193527 100644 (file)
--- a/question/type/match/edit_match_form.php
+++ b/question/type/match/edit_match_form.php
@@ -45,7 +45,7 @@ class question_edit_match_form extends question_edit_form {
 
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $subquestions = $question->options->subquestions;
             if (count($subquestions)) {
@@ -59,7 +59,7 @@ class question_edit_match_form extends question_edit_form {
             $default_values['shuffleanswers'] =  $question->options->shuffleanswers;
             $question = (object)((array)$question + $default_values);
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/multianswer/edit_multianswer_form.php b/question/type/multianswer/edit_multianswer_form.php
index 2afa18ba9224b780bbbcb45e4a30ee387b99a047..79aa7d2c2a9022acd8a39d2f6156caef5601d27d 100644 (file)
--- a/question/type/multianswer/edit_multianswer_form.php
+++ b/question/type/multianswer/edit_multianswer_form.php
@@ -15,7 +15,7 @@ class question_edit_multianswer_form extends question_edit_form {
 
     // No question-type specific form fields.
 
-    function set_defaults($question) {
+    function set_data($question) {
         if ($question->questiontext and $question->id and $question->qtype) {
 
             foreach ($question->options->questions as $key => $wrapped) {

diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php
index b11790e698fc421a1d6dda07b5e1c40ffb4827b3..8b22f0dbdf375840dc40da934fc5d7b978d10ff1 100644 (file)
--- a/question/type/multichoice/edit_multichoice_form.php
+++ b/question/type/multichoice/edit_multichoice_form.php
@@ -62,7 +62,7 @@ class question_edit_multichoice_form extends question_edit_form {
 
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $answers = $question->options->answers;
             if (count($answers)) {
@@ -81,7 +81,7 @@ class question_edit_multichoice_form extends question_edit_form {
             $default_values['incorrectfeedback'] =  $question->options->incorrectfeedback;
             $question = (object)((array)$question + $default_values);
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/numerical/edit_numerical_form.php b/question/type/numerical/edit_numerical_form.php
index 25c8196ed69c1fe26424cae0644a3f9313f9155c..a40acf349c4581f5396116bafb12bf258ab29851 100644 (file)
--- a/question/type/numerical/edit_numerical_form.php
+++ b/question/type/numerical/edit_numerical_form.php
@@ -74,7 +74,7 @@ class question_edit_numerical_form extends question_edit_form {
         $firstunit->setPersistantFreeze(true);
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $answers = $question->options->answers;
             if (count($answers)) {
@@ -102,7 +102,7 @@ class question_edit_numerical_form extends question_edit_form {
             }
             $question = (object)((array)$question + $default_values);
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
     function validation($data){
         $errors = array();

diff --git a/question/type/random/edit_random_form.php b/question/type/random/edit_random_form.php
index 707957bde4e0065a8d492c4d5cd8056a57221bf1..b33cec144da95f503926bb9e7bd04391c2c442b7 100644 (file)
--- a/question/type/random/edit_random_form.php
+++ b/question/type/random/edit_random_form.php
@@ -64,11 +64,11 @@ class question_edit_random_form extends question_edit_form {
         $mform->closeHeaderBefore('buttonar');
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (empty($question->name)) {
             $question->name = get_string("random", "quiz");
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/randomsamatch/edit_randomsamatch_form.php b/question/type/randomsamatch/edit_randomsamatch_form.php
index 98a0255af8cf06dd73a0012b164d2f0aa470f489..9504951fd5303bfafd12c44b59741fdee71cc5c3 100644 (file)
--- a/question/type/randomsamatch/edit_randomsamatch_form.php
+++ b/question/type/randomsamatch/edit_randomsamatch_form.php
@@ -31,7 +31,7 @@ class question_edit_randomsamatch_form extends question_edit_form {
         $mform->addElement('hidden', 'fraction', 0);
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (empty($question->name)) {
             $question->name =  get_string("randomsamatch", "quiz");
         }
@@ -39,7 +39,7 @@ class question_edit_randomsamatch_form extends question_edit_form {
         if (empty($question->questiontext)) {
             $question->questiontext =  get_string("randomsamatchintro", "quiz");
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {

diff --git a/question/type/shortanswer/edit_shortanswer_form.php b/question/type/shortanswer/edit_shortanswer_form.php
index 6a3cb148cd6af8409723e01caeb279ac93148517..6122be63263da3959040971a8f4f96dc842cf1a6 100644 (file)
--- a/question/type/shortanswer/edit_shortanswer_form.php
+++ b/question/type/shortanswer/edit_shortanswer_form.php
@@ -46,7 +46,7 @@ class question_edit_shortanswer_form extends question_edit_form {
 
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (isset($question->options)){
             $answers = $question->options->answers;
             if (count($answers)) {
@@ -61,7 +61,7 @@ class question_edit_shortanswer_form extends question_edit_form {
             $default_values['usecase'] =  $question->options->usecase;
             $question = (object)((array)$question + $default_values);
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
     function validation($data){
         $errors = array();

diff --git a/question/type/truefalse/edit_truefalse_form.php b/question/type/truefalse/edit_truefalse_form.php
index ad1fe3a13e6861ad8e3484a45499b7a36994b34b..c54909eaa6b6b832f75fc29e80dd72c2f1d69f41 100644 (file)
--- a/question/type/truefalse/edit_truefalse_form.php
+++ b/question/type/truefalse/edit_truefalse_form.php
@@ -29,14 +29,14 @@ class question_edit_truefalse_form extends question_edit_form {
         $mform->setType('feedbackfalse', PARAM_RAW);
     }
 
-    function set_defaults($question) {
+    function set_data($question) {
         if (!empty($question->options->trueanswer)) {
             $trueanswer = $question->options->answers[$question->options->trueanswer];
             $question->correctanswer = ($trueanswer->fraction != 0);
             $question->feedbacktrue = $trueanswer->feedback;
             $question->feedbackfalse = $question->options->answers[$question->options->falseanswer]->feedback;
         }
-        parent::set_defaults($question);
+        parent::set_data($question);
     }
 
     function qtype() {