Merge branch 'MDL-27155_master' of git://github.com/timhunt/moodle

This commit is contained in:
Sam Hemelryk
2011-05-02 14:03:36 +08:00
+7 -2
View File
@@ -299,9 +299,14 @@ class question_numerical_qtype extends question_shortanswer_qtype {
$options->unitsleft = 0 ;
}
$options->instructions = $this->import_or_save_files($question->instructions,
if (isset($question->instructions) && is_array($question->instructions)){
$options->instructions = $this->import_or_save_files($question->instructions,
$question->context, 'qtype_'.$question->qtype , 'instruction', $question->id);
$options->instructionsformat = $question->instructions['format'];
$options->instructionsformat = $question->instructions['format'];
} else {
$options->instructions = '' ;
$options->instructionsformat = editors_get_preferred_format();
}
$DB->update_record('question_numerical_options', $options);