L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jean-Michel Vedrine
2012-12-08 20:44:01 +01:00
parent c274d5eef9
commit 29d1e1ff76
5 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/format.php
-8
View File
@@ -387,14 +387,6 @@ class qformat_default {
$newpage->contents = $question->questiontext;
$newpage->contentsformat = isset($question->questionformat) ? $question->questionformat : FORMAT_HTML;
// Sometimes, questiontext is not a simple text, but one array
// containing both text and format, so we need to support here
// that case with the following dirty patch. MDL-35147
if (is_array($question->questiontext)) {
$newpage->contents = isset($question->questiontext['text']) ? $question->questiontext['text'] : '';
$newpage->contentsformat = isset($question->questiontext['format']) ? $question->questiontext['format'] : FORMAT_HTML;
}
// set up page links
if ($pageid) {
// the new page follows on from this page
question/format.php
+4 -13
View File
@@ -413,20 +413,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)) {
@@ -435,8 +426,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)) {
question/format/blackboard_six/formatbase.php
-12
View File
@@ -148,16 +148,4 @@ class qformat_blackboard_six_base extends qformat_based_on_xml {
public function cleaned_text_field($text) {
return $this->text_field($this->cleaninput($text));
}
/**
* Convert the question text to plain text.
* We need to overwrite this function because questiontext is an array.
*/
protected function format_question_text($question) {
global $DB;
$formatoptions = new stdClass();
$formatoptions->noclean = true;
return html_to_text(format_text($question->questiontext['text'],
$question->questiontext['format'], $formatoptions), 0, false);
}
}
question/format/blackboard_six/formatpool.php
+8 -4
View File
@@ -88,12 +88,16 @@ class qformat_blackboard_six_pool extends qformat_blackboard_six_base {
array('#', 'BODY', 0, '#', 'TEXT', 0, '#'),
'', true, get_string('importnotext', 'qformat_blackboard_six'));
$question->questiontext = $this->cleaned_text_field($text);
$question->questiontextformat = FORMAT_HTML; // Needed because add_blank_combined_feedback uses it.
$questiontext = $this->cleaned_text_field($text);
$question->questiontext = $questiontext['text'];
$question->questiontextformat = $questiontext['format']; // Needed because add_blank_combined_feedback uses it.
if (isset($questiontext['itemid'])) {
$question->questiontextitemid = $questiontext['itemid'];
}
// Put name in question object. We must ensure it is not empty and it is less than 250 chars.
$id = $this->getpath($questiondata, array('@', 'id'), '', true);
$question->name = $this->create_default_question_name($question->questiontext['text'],
$question->name = $this->create_default_question_name($question->questiontext,
get_string('defaultname', 'qformat_blackboard_six' , $id));
$question->generalfeedback = '';
@@ -453,7 +457,7 @@ class qformat_blackboard_six_pool extends qformat_blackboard_six_base {
$subanswercount++;
}
if ($subquestioncount < 2 || $subanswercount < 3) {
$this->error(get_string('notenoughtsubans', 'qformat_blackboard_six', $question->questiontext['text']));
$this->error(get_string('notenoughtsubans', 'qformat_blackboard_six', $question->questiontext));
} else {
$questions[] = $question;
}
question/format/blackboard_six/formatqti.php
+8 -6
View File
@@ -506,11 +506,13 @@ class qformat_blackboard_six_qti extends qformat_blackboard_six_base {
public function process_common($quest) {
$question = $this->defaultquestion();
$text = $quest->QUESTION_BLOCK->text;
$question->questiontext = $this->cleaned_text_field($text);
$question->questiontextformat = FORMAT_HTML; // Needed because add_blank_combined_feedback uses it.
$question->name = $this->create_default_question_name($question->questiontext['text'],
$questiontext = $this->cleaned_text_field($text);
$question->questiontext = $questiontext['text'];
$question->questiontextformat = $questiontext['format']; // Needed because add_blank_combined_feedback uses it.
if (isset($questiontext['itemid'])) {
$question->questiontextitemid = $questiontext['itemid'];
}
$question->name = $this->create_default_question_name($question->questiontext,
get_string('defaultname', 'qformat_blackboard_six' , $quest->id));
$question->generalfeedback = '';
$question->generalfeedbackformat = FORMAT_HTML;
@@ -863,7 +865,7 @@ class qformat_blackboard_six_qti extends qformat_blackboard_six_base {
$subanswercount++;
}
if ($subquestioncount < 2 || $subanswercount < 3) {
$this->error(get_string('notenoughtsubans', 'qformat_blackboard_six', $question->questiontext['text']));
$this->error(get_string('notenoughtsubans', 'qformat_blackboard_six', $question->questiontext));
} else {
$questions[] = $question;
}