You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/11/19 15:01:22 UTC

[11/26] allura git commit: [#7704] ticket:662 Don't try to log in if user isn't active after registration

[#7704] ticket:662 Don't try to log in if user isn't active after registration


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/fce5dfd0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/fce5dfd0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/fce5dfd0

Branch: refs/heads/ib/7794
Commit: fce5dfd08325dc15b8a6758c7187313656ebbdb6
Parents: 50eeec2
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Oct 15 11:49:16 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Nov 17 19:18:04 2014 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/fce5dfd0/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 35d8207..489bacc 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -229,12 +229,12 @@ class AuthController(BaseController):
                  display_name=display_name,
                  password=pw,
                  pending=require_email))
-        plugin.AuthenticationProvider.get(request).login(user)
         if require_email:
             em = user.claim_address(email)
             em.send_verification_link()
             flash('User "%s" registered. Verification link was sent to your email.' % username)
         else:
+            plugin.AuthenticationProvider.get(request).login(user)
             flash('User "%s" registered' % username)
         redirect('/')