Use case-insensitive email selection only when case-sensitive comes u…

…p empty.
galaxyproject · Aug 27, 2015 · c337fcc · c337fcc
1 parent 9356ae5
commit c337fcc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/galaxy/webapps/galaxy/controllers/user.py b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -1184,7 +1184,10 @@ def reset_password( self, trans, email=None, **kwd ):
                 message = ( "Your reset request for %s has been received.  "
                             "Please check your email account for more instructions.  "
                             "If you do not receive an email shortly, please contact an administrator." % ( escape( email ) ) )
-                reset_user = trans.sa_session.query( trans.app.model.User ).filter( func.lower(trans.app.model.User.table.c.email) == func.lower(email) ).first()
+                reset_user = trans.sa_session.query( trans.app.model.User ).filter( trans.app.model.User.table.c.email == email ).first()
+                if not reset_user:
+                    # Perform a case-insensitive check only if the user wasn't found
+                    reset_user = trans.sa_session.query( trans.app.model.User ).filter( func.lower(trans.app.model.User.table.c.email) == func.lower(email) ).first()
                 if reset_user:
                     prt = trans.app.model.PasswordResetToken( reset_user )
                     trans.sa_session.add( prt )