Merge branch 'master' of https://github.com/web2py/web2py into pydal-pip

Conflicts: gluon/dal/_load.py
2015-01-22 14:49:07 +01:00
parent ff43ab7a20 a2f5d1cfc5
commit 7d6e473cd0
2 changed files with 6 additions and 1 deletions
@@ -3097,10 +3097,15 @@ class Auth(object):
                IS_EMAIL(error_message=self.messages.invalid_email),
                IS_IN_DB(self.db, table_user.email,
                         error_message=self.messages.invalid_email)]
+            if not self.settings.email_case_sensitive:
+                table_user.email.requires.insert(0, IS_LOWER())
        else:
            table_user.username.requires = [
                IS_IN_DB(self.db, table_user.username,
                         error_message=self.messages.invalid_username)]
+            if not self.settings.username_case_sensitive:
+                table_user.username.requires.insert(0, IS_LOWER())
+
        form = SQLFORM(table_user,
                       fields=[userfield],
                       hidden=dict(_next=next),