diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 19:34:49 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 19:34:49 -0700 |
| commit | 0578d8b31b27af45fb8aa94bdb028972ed8adce4 (patch) | |
| tree | 8ca70b27c7af8f66d9917aabedb67e3e4fb127fd /mediagoblin/auth/tools.py | |
| parent | b1e02e0a702ffd085abdb5a4e1d3ca0b9c6192f1 (diff) | |
| download | mediagoblin-0578d8b31b27af45fb8aa94bdb028972ed8adce4.tar.lz mediagoblin-0578d8b31b27af45fb8aa94bdb028972ed8adce4.tar.xz mediagoblin-0578d8b31b27af45fb8aa94bdb028972ed8adce4.zip | |
Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/plugins/basic_auth/tools.py
Diffstat (limited to 'mediagoblin/auth/tools.py')
| -rw-r--r-- | mediagoblin/auth/tools.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index e2c84347..48e0d572 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -17,6 +17,7 @@ import logging import wtforms +from sqlalchemy import or_ from mediagoblin import mg_globals from mediagoblin.db.models import User @@ -33,6 +34,8 @@ _log = logging.getLogger(__name__) _log = logging.getLogger(__name__) +_log = logging.getLogger(__name__) + def normalize_user_or_email_field(allow_email=True, allow_user=True): """ @@ -193,6 +196,7 @@ def register_user(request, register_form): # send verification email email_debug_message(request) send_verification_email(user, request) + return user return None |