Permalink
Browse files

MDL-29528 qtype multichoice and caclulated combined feedback format o…

…verwritten during upgrade.

Conflicts:

	question/type/multichoice/backup/moodle1/lib.php
  • Loading branch information...
timhunt committed Sep 26, 2011
1 parent 51e1e3d commit 7c144c47e50406b14bb1a304cf3a27bcc631b7a3
Showing with 2 additions and 2 deletions.
  1. +1 −1 question/type/calculated/db/upgrade.php
  2. +1 −1 question/type/multichoice/db/upgrade.php
@@ -183,7 +183,7 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
$record->incorrectfeedbackformat = FORMAT_HTML;
} else {
$record->correctfeedbackformat = $record->oldquestiontextformat;
- $record->partiallycorrectfeedback = $record->oldquestiontextformat;
+ $record->partiallycorrectfeedbackformat = $record->oldquestiontextformat;
$record->incorrectfeedbackformat = $record->oldquestiontextformat;
}
$DB->update_record('question_calculated_options', $record);
@@ -98,7 +98,7 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
$record->incorrectfeedbackformat = FORMAT_HTML;
} else {
$record->correctfeedbackformat = $record->oldquestiontextformat;
- $record->partiallycorrectfeedback = $record->oldquestiontextformat;
+ $record->partiallycorrectfeedbackformat = $record->oldquestiontextformat;
$record->incorrectfeedbackformat = $record->oldquestiontextformat;
}
$DB->update_record('question_multichoice', $record);

0 comments on commit 7c144c4

Please sign in to comment.