You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/09/29 17:31:57 UTC
[2/4] git commit: [#7683] Bugfix
[#7683] Bugfix
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6a489c09
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6a489c09
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6a489c09
Branch: refs/heads/master
Commit: 6a489c0915e6fa9a4fbfe92a01f84ee0a1f39323
Parents: d7f5a7c
Author: Alexander Luberg <al...@slashdotmedia.com>
Authored: Wed Sep 24 12:25:35 2014 -0700
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Sep 29 15:31:41 2014 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6a489c09/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 47fd90f..8944f74 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -198,7 +198,7 @@ class AuthController(BaseController):
hash_expiry=datetime.datetime.utcnow() +
datetime.timedelta(seconds=int(config.get('auth.recovery_hash_expiry_period', 600))))
- log.info('Sending password recovery link to %s', email)
+ log.info('Sending password recovery link to %s', email_record.email)
subject = '%s Password recovery' % config['site_name']
text = g.jinja2_env.get_template('allura:templates/mail/forgot_password.txt').render(dict(
user=user_record,
@@ -207,7 +207,7 @@ class AuthController(BaseController):
))
allura.tasks.mail_tasks.sendsimplemail.post(
- toaddr=email,
+ toaddr=email_record.email,
fromaddr=config['forgemail.return_path'],
reply_to=config['forgemail.return_path'],
subject=subject,