]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-17125
authorthepurpleblob <thepurpleblob>
Wed, 26 Nov 2008 15:15:58 +0000 (15:15 +0000)
committerthepurpleblob <thepurpleblob>
Wed, 26 Nov 2008 15:15:58 +0000 (15:15 +0000)
Fix as suggested by Jonathan Kemp.

Merged from STABLE_19

mod/lesson/action/continue.php

index cf000ea32ca33067442c28517f3753f99202ca05..5d03ac63eef45bac28e064330201757feab84359 100644 (file)
                     $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) ) {
+                if (lesson_iscorrect($pageid, $answer->jumpto) and ($lesson->custom && $answer->score > 0) ) {
                     if (!$useregexp) { // we are using 'normal analysis', which ignores case
                         if (preg_match('/^'.$expectedanswer.'$/i',$useranswer)) {
                             $ismatch = true;