diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
| commit | bb770e295cd727429df524b0a5c3952ea449fdb2 (patch) | |
| tree | e8a894c2a75e7ff53946b05508f82b501c37189e /mediagoblin/auth/lib.py | |
| parent | bb10e5bef7ae062424b4c334a73c4ce988e37ccf (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.lz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.xz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/auth/lib.py')
| -rw-r--r-- | mediagoblin/auth/lib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py index f40e560f..08bbdd16 100644 --- a/mediagoblin/auth/lib.py +++ b/mediagoblin/auth/lib.py @@ -20,7 +20,7 @@ import random import bcrypt from mediagoblin.util import send_email, render_template -from mediagoblin import globals as mgoblin_globals +from mediagoblin import mg_globals def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None): @@ -112,7 +112,7 @@ def send_verification_email(user, request): # TODO: There is no error handling in place send_email( - mgoblin_globals.email_sender_address, + mg_globals.email_sender_address, [user['email']], # TODO # Due to the distributed nature of GNU MediaGoblin, we should |