Merge pull request #103 from catalyst/unsuspend-email

Fix incorrect assumption about username based on email

classes/utility.php

@@ -59,11 +59,6 @@ public static function search_for_suspended_user($data) {
             $params['username'] = $data['username'];
         }
 
-        // This setting means the email address is the username.
-        if ($CFG->createuserwithemail) {
-            $params['username'] = $data['email'];
-        }
-
         return $DB->get_record('user', $params, '*');
     }
 

unsuspend.php

@@ -41,6 +41,7 @@
 $PAGE->set_pagelayout('login');
 $PAGE->set_title(get_string('title_unsuspend', 'auth_enrolkey'));
 $PAGE->set_heading(get_string('heading_unsuspend', 'auth_enrolkey'));
+$PAGE->set_context($context);
 $output = $PAGE->get_renderer('auth_enrolkey');
 
 $form = new unsuspend_form($baseurl);