Merge branch 'wip-MDL-55826-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Dan Poltawski
2016-09-05 08:18:32 +01:00
+17 -12
View File
@@ -621,9 +621,6 @@ class qformat_default {
$question->questiontextformat = FORMAT_MOODLE;
$question->generalfeedback = '';
$question->generalfeedbackformat = FORMAT_MOODLE;
$question->correctfeedback = '';
$question->partiallycorrectfeedback = '';
$question->incorrectfeedback = '';
$question->answernumbering = 'abc';
$question->penalty = 0.3333333;
$question->length = 1;
@@ -633,6 +630,8 @@ class qformat_default {
$question->export_process = true;
$question->import_process = true;
$this->add_blank_combined_feedback($question);
return $question;
}
@@ -673,15 +672,21 @@ class qformat_default {
* @return object question
*/
protected function add_blank_combined_feedback($question) {
$question->correctfeedback['text'] = '';
$question->correctfeedback['format'] = $question->questiontextformat;
$question->correctfeedback['files'] = array();
$question->partiallycorrectfeedback['text'] = '';
$question->partiallycorrectfeedback['format'] = $question->questiontextformat;
$question->partiallycorrectfeedback['files'] = array();
$question->incorrectfeedback['text'] = '';
$question->incorrectfeedback['format'] = $question->questiontextformat;
$question->incorrectfeedback['files'] = array();
$question->correctfeedback = [
'text' => '',
'format' => $question->questiontextformat,
'files' => []
];
$question->partiallycorrectfeedback = [
'text' => '',
'format' => $question->questiontextformat,
'files' => []
];
$question->incorrectfeedback = [
'text' => '',
'format' => $question->questiontextformat,
'files' => []
];
return $question;
}