diff options
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 5 | ||||
| -rw-r--r-- | askbot/doc/source/changelog.rst | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index e9059c61..5f332a1a 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -48,6 +48,7 @@ from django.utils.safestring import mark_safe from django.core.mail import send_mail from recaptcha_works.decorators import fix_recaptcha_remote_ip from askbot.skins.loaders import render_into_skin, get_template +from urlparse import urlparse from openid.consumer.consumer import Consumer, \ SUCCESS, CANCEL, FAILURE, SETUP_NEEDED @@ -1094,8 +1095,10 @@ def _send_email_key(user): to user's email address """ subject = _("Recover your %(site)s account") % {'site': askbot_settings.APP_SHORT_NAME} + + url = urlparse(askbot_settings.APP_URL) data = { - 'validation_link': askbot_settings.APP_URL + \ + 'validation_link': url.scheme + '://' + url.netloc + \ reverse( 'user_account_recover', kwargs={'key':user.email_key} diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 7751cba6..33a6dbb2 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -1,6 +1,10 @@ Changes in Askbot ================= +Development version (not released yet) +-------------------------------------- +* Made email recovery link work when askbot is deployed on subdirectory (Evgeny) + 0.7.39 (Jan 11, 2012) --------------------- * restored facebook login after FB changed the procedure (Evgeny) |