web/views/authentication.py
branchtls-sprint
changeset 1490 6b024694d493
parent 1488 6da89a703c5a
child 1663 89efe0e744cf
child 1668 d2ac1d681d70
--- a/web/views/authentication.py	Mon Apr 27 19:20:00 2009 +0200
+++ b/web/views/authentication.py	Mon Apr 27 19:33:34 2009 +0200
@@ -74,7 +74,7 @@
             login, password = _login, _password
         else:
             login, password = req.get_authorization()
-        if '@' in (login or u''):
+        if self.vreg.config['allow-email-login'] and '@' in (login or u''):
             login = self.login_from_email(login)
         if not login:
             # No session and no login -> try anonymous