Merged bug fix for cloze upgrading and also some formatting from STABLE

moodle · Aug 21, 2005 · 70a6245 · 70a6245
1 parent fb12ecd
commit 70a6245
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/mod/quiz/questiontypes/multianswer/editquestion.php b/mod/quiz/questiontypes/multianswer/editquestion.php
@@ -40,17 +40,13 @@
                 }
                 $parsableanswerdef .= '}';
                 // Fix the questiontext fields of old questions
-                set_field('quiz_questions', 'questiontext', $parsableanswerdef,
+                set_field('quiz_questions', 'questiontext', addslashes($parsableanswerdef), 'id', $wrapped->id);
-                 'id', $wrapped->id);
             } else {
-                $parsableanswerdef = str_replace('&#', '&\#',
+                $parsableanswerdef = str_replace('&#', '&\#', $wrapped->questiontext);
-                 $wrapped->questiontext);
             }
             //echo "{#$key}<br />";
             //echo $parsableanswerdef.'<br />';
-            $question->questiontext = str_replace
+            $question->questiontext = str_replace("{#$key}", $parsableanswerdef, $question->questiontext);
-                    ("{#$key}", $parsableanswerdef,
-                     $question->questiontext);
         }
     }
     print_heading_with_help(get_string('editingmultianswer', 'quiz'),

diff --git a/mod/quiz/questiontypes/multianswer/questiontype.php b/mod/quiz/questiontypes/multianswer/questiontype.php
@@ -20,25 +20,23 @@ function name() {
     }
 
     function get_question_options(&$question) {
+        global $QUIZ_QTYPES;
+
         // Get relevant data indexed by positionkey from the multianswers table
-        if (!$sequence = get_field('quiz_multianswers', 'sequence', 'question',
+        if (!$sequence = get_field('quiz_multianswers', 'sequence', 'question', $question->id)) {
-         $question->id)) {
             notify('Error: Missing question options!');
             return false;
         }
 
-        global $QUIZ_QTYPES;
         $wrappedquestions = get_records_list('quiz_questions', 'id', $sequence);
 
         // We want an array with question ids as index and the positions as values
         $sequence = array_flip(explode(',', $sequence));
         array_walk($sequence, create_function('&$val', '$val++;'));
 
         foreach ($wrappedquestions as $wrapped) {
-            if (!$QUIZ_QTYPES[$wrapped->qtype]
+            if (!$QUIZ_QTYPES[$wrapped->qtype]->get_question_options($wrapped)) {
-             ->get_question_options($wrapped)) {
+                notify("Unable to get options for questiontype {$wrapped->qtype} (id={$wrapped->id})");
-                notify("Unable to get options for questiontype
-                {$wrapped->qtype} (id={$wrapped->id})");
             }
             $wrapped->maxgrade = $wrapped->defaultgrade;
             $question->options->questions[$sequence[$wrapped->id]] = clone($wrapped);
@@ -49,8 +47,7 @@ function get_question_options(&$question) {
 
     function save_question_options($question) {
         global $QUIZ_QTYPES;
-        if (!$oldwrappedids =
+        if (!$oldwrappedids = get_records('quiz_questions', 'parent', $question->id, '', 'id, id')) {
-         get_records('quiz_questions', 'parent', $question->id, '', 'id, id')) {
          // We need to select 'id, id' because the first one is consumed by
          // get_records.
             $oldwrappedids = array();
@@ -96,8 +93,7 @@ function save_question_options($question) {
     }
 
     function save_question($authorizedquestion, $form, $course) {
-        $question =
+        $question = quiz_qtype_multianswer_extract_question ($form->questiontext);
-         quiz_qtype_multianswer_extract_question ($form->questiontext);
         if (isset($authorizedquestion->id)) {
             $question->id = $authorizedquestion->id;
             $question->version = $form->version = $authorizedquestion->version;
@@ -167,8 +163,7 @@ function get_correct_responses(&$question, &$state) {
         return $responses;
     }
 
-    function print_question_formulation_and_controls(&$question, &$state, $cmoptions,
+    function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) {
-     $options) {
         global $QUIZ_QTYPES;
         $readonly = empty($options->readonly) ? '' : 'readonly="readonly"';
         $nameprefix = $question->name_prefix;
@@ -458,8 +453,7 @@ function quiz_qtype_multianswer_extract_question($text) {
         $wrapped->answer   = array();
         $wrapped->fraction = array();
         $wrapped->feedback = array();
-        $wrapped->questiontext = addslashes(str_replace('&\#', '&#',
+        $wrapped->questiontext = addslashes(str_replace('&\#', '&#', $answerregs[0]));
-         $answerregs[0]));
         $wrapped->questiontextformat = 0;
 
         $remainingalts = $answerregs[ANSWER_REGEX_ALTERNATIVES];
@@ -501,8 +495,7 @@ function quiz_qtype_multianswer_extract_question($text) {
         $question->questiontext = implode("{#$positionkey}",
                     explode($answerregs[0], $question->questiontext, 2));
     }
-    $question->questiontext = addslashes(str_replace('&\#', '&#',
+    $question->questiontext = addslashes(str_replace('&\#', '&#', $question->questiontext));
-     $question->questiontext));
     return $question;
 }