[Merged][BugFix] Bug 5485 - problem with regular expressions with simple analysis

diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php
index 261de15984e6d9cfdc361ef121c5a62455d637df..cd7c3a1379b97ed640269c4f1a6c5573098d475e 100644 (file)
--- a/mod/lesson/action/continue.php
+++ b/mod/lesson/action/continue.php
@@ -156,10 +156,10 @@
                         $expectedanswer = substr($expectedanswer,0,strlen($expectedanswer) - 2);
                         $ignorecase = 'i';
                     }
-                }
-                // prevent the potential apostrophe problem!
-                if (preg_match_all("/'/",$expectedanswer, $matches)) {
-                    $expectedanswer = ereg_replace("'", "\\\'", $expectedanswer);
+                } else {
+                    $expectedanswer = str_replace('*', '#####', $expectedanswer);
+                    $expectedanswer = preg_quote($expectedanswer, '/');
+                    $expectedanswer = str_replace('#####', '.*', $expectedanswer);
                 }
                 // see if user typed in any of the correct answers
                 if (lesson_iscorrect($pageid, $answer->jumpto) or ($lesson->custom && $answer->score > 0) ) {