moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-36243 question->questiontext and question->generalfeedback should always be strings

Browse source
This commit is contained in:
Jean-Michel Vedrine 2012-10-28 20:01:25 +01:00
parent 4bd6f71bad
commit 7980a381cc
7 changed files with 32 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

17
question/format.php
View file

@ -390,20 +390,11 @@ class qformat_default {
'maxfiles' => -1,
'maxbytes' => 0,
);
if (is_array($question->questiontext)) {
// Importing images from draftfile.
$questiontext = $question->questiontext;
$question->questiontext = $questiontext['text'];
}
if (is_array($question->generalfeedback)) {
$generalfeedback = $question->generalfeedback;
$question->generalfeedback = $generalfeedback['text'];
}
$question->id = $DB->insert_record('question', $question);
if (!empty($questiontext['itemid'])) {
$question->questiontext = file_save_draft_area_files($questiontext['itemid'],
if (isset($question->questiontextitemid)) {
$question->questiontext = file_save_draft_area_files($question->questiontextitemid,
$this->importcontext->id, 'question', 'questiontext', $question->id,
$fileoptions, $question->questiontext);
} else if (isset($question->questiontextfiles)) {
@ -412,8 +403,8 @@ class qformat_default {
$this->importcontext, 'question', 'questiontext', $question->id, $file);
}
}
if (!empty($generalfeedback['itemid'])) {
$question->generalfeedback = file_save_draft_area_files($generalfeedback['itemid'],
if (isset($question->generalfeedbackitemid)) {
$question->generalfeedback = file_save_draft_area_files($question->generalfeedbackitemid,
$this->importcontext->id, 'question', 'generalfeedback', $question->id,
$fileoptions, $question->generalfeedback);
} else if (isset($question->generalfeedbackfiles)) {