Permalink
Browse files

Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into…

… MOODLE_22_STABLE
  • Loading branch information...
2 parents 1db9d1e + cb69b47 commit 4340e2faace07f7eb45870cd789640515648a749 Sam Hemelryk committed Sep 11, 2012
Showing with 16 additions and 0 deletions.
  1. +16 −0 backup/moodle2/restore_qtype_plugin.class.php
View
16 backup/moodle2/restore_qtype_plugin.class.php
@@ -149,6 +149,22 @@ public function process_question_answer($data) {
AND ' . $DB->sql_compare_text('answer', 255) . ' = ' . $DB->sql_compare_text('?', 255);
$params = array($newquestionid, $data->answertext);
$newitemid = $DB->get_field_sql($sql, $params);
+
+ // Not able to find the answer, let's try cleaning the answertext
+ // of all the question answers in DB as slower fallback. MDL-30018.
+ if (!$newitemid) {
+ $params = array('question' => $newquestionid);
+ $answers = $DB->get_records('question_answers', $params, '', 'id, answer');
+ foreach ($answers as $answer) {
+ // Clean in the same way than {@link xml_writer::xml_safe_utf8()}.
+ $clean = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is','', $answer->answer); // Clean CTRL chars.
+ $clean = preg_replace("/\r\n|\r/", "\n", $clean); // Normalize line ending.
+ if ($clean === $data->answertext) {
+ $newitemid = $data->id;
+ }
+ }
+ }
+
// If we haven't found the newitemid, something has gone really wrong, question in DB
// is missing answers, exception
if (!$newitemid) {

0 comments on commit 4340e2f

Please sign in to comment.