Merge pull request #3486 from Zharktas/master

Use h.url_for and qualified=True for reset mails
ckan · Mar 21, 2017 · b4dc4c7 · b4dc4c7
2 parents 51d14e8 + 99cdca1
commit b4dc4c7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ckan/lib/mailer.py b/ckan/lib/mailer.py
@@ -144,11 +144,11 @@ def get_invite_body(user, group_dict=None, role=None):
 
 
 def get_reset_link(user):
-    return urljoin(config.get('site_url'),
-                   h.url_for(controller='user',
-                             action='perform_reset',
-                             id=user.id,
-                             key=user.reset_key))
+    return h.url_for(controller='user',
+                     action='perform_reset',
+                     id=user.id,
+                     key=user.reset_key,
+                     qualified=True)
 
 
 def send_reset_link(user):