Index: login/forgot_password_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/login/forgot_password_form.php,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 forgot_password_form.php
--- login/forgot_password_form.php	23 Nov 2007 22:12:35 -0000	1.7.2.1
+++ login/forgot_password_form.php	27 Apr 2010 14:56:17 -0000
@@ -24,7 +24,7 @@
 
         $errors = parent::validation($data, $files);
 
-        if ((!empty($data['username']) and !empty($data['email'])) or (empty($data['username']) and empty($data['email']))) {
+        if (empty($data['username']) and empty($data['email'])) {
             $errors['username'] = get_string('usernameoremail');
             $errors['email']    = get_string('usernameoremail');