MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE

Conflicts: questiontype.php
2011-11-19 17:09:18 +07:00
parent d7625a96f1 d36f336d84
commit 2bd257656b
1 changed files with 3 additions and 1 deletions
@@ -190,7 +190,9 @@ class qtype_ddimageortext extends qtype_ddtoimage_base {
        if ($question->options->shuffleanswers) {
            $output .= "    <shuffleanswers/>\n";
        }
-        $output .= $format->write_combined_feedback($question->options);
+        $output .= $format->write_combined_feedback($question->options,
+                                                    $question->id,
+                                                    $question->contextid);
        $output .= $format->write_hints($question);
        $files = $fs->get_area_files($contextid, 'qtype_ddimageortext', 'bgimage', $question->id);
        $output .= "    ".$this->write_files($files, 2)."\n";;