MDL-9952 - Cant escape # by using \ in a Cloze question. Merged from MOODLE_18_STABLE.

diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php
index 68f5400b212bb1f5bd5bcafe2235b24dc06a5f89..93f8fd1c04e3669d59a5129684a45dd9167dba1b 100644 (file)
--- a/question/type/multianswer/questiontype.php
+++ b/question/type/multianswer/questiontype.php
@@ -701,7 +701,8 @@ function qtype_multianswer_extract_question($text) {
             }
             if (isset($altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK])) {
                 $feedback = html_entity_decode($altregs[ANSWER_ALTERNATIVE_REGEX_FEEDBACK], ENT_QUOTES, 'UTF-8');
-                $wrapped->feedback[] = str_replace('\}', '}', $feedback);
+                $feedback = str_replace('\}', '}', $feedback);
+                $wrapped->feedback[] = str_replace('\#', '#', $feedback);
             } else {
                 $wrapped->feedback[] = '';
             }
@@ -717,7 +718,8 @@ function qtype_multianswer_extract_question($text) {
             } else { // Tolerance can stay undefined for non numerical questions
                 // Undo quoting done by the HTML editor.
                 $answer = html_entity_decode($altregs[ANSWER_ALTERNATIVE_REGEX_ANSWER], ENT_QUOTES, 'UTF-8');
-                $wrapped->answer[] = str_replace('\}', '}', $answer);
+                $answer = str_replace('\}', '}', $answer);
+                $wrapped->answer[] = str_replace('\#', '#', $answer);
             }
             $tmp = explode($altregs[0], $remainingalts, 2);
             $remainingalts = $tmp[1];