MDL-2414 - using quotes in enrolment keys failed due to slashes.

merged from MOODLE_19_STABLE

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index 49fb53194428a521327de22c4d19a601c4cd9131..46030f87b1ee988cceb88f961ac24402b8967ed1 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -146,7 +146,7 @@ function check_entry($form, $course) {
 
     $groupid = $this->check_group_entry($course->id, $form->password);
 
-    if (($form->password == $course->password) or ($groupid !== false) ) {
+    if ((stripslashes($form->password) == $course->password) or ($groupid !== false) ) {
 
         if (isguestuser()) { // only real user guest, do not use this for users with guest role
             $USER->enrolkey[$course->id] = true;
@@ -191,7 +191,7 @@ function check_group_entry ($courseid, $password) {
     $ingroup = false;
     if (($groups = groups_get_all_groups($courseid))) {
         foreach ($groups as $group) {
-            if ( !empty($group->enrolmentkey) and ($password == $group->enrolmentkey) ) {
+            if ( !empty($group->enrolmentkey) and (stripslashes($password) == $group->enrolmentkey) ) {
                 $ingroup = $group->id;
             }
         }