Skip to content

Commit

Permalink
[#1635] Remove pylons.g from lib/mailer.py
Browse files Browse the repository at this point in the history
Don't use pylons.g in ckan/lib/mailer.py, use pylons.config instead.
This allows mailer.py to be used from outside of a Pylons request thread
(where pylons.g has not been registered for the thread), e.g. from a
paster command.
  • Loading branch information
Sean Hammond committed Dec 3, 2012
1 parent 35cb12b commit ed221a2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions ckan/lib/mailer.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from urlparse import urljoin

from pylons.i18n.translation import _
from pylons import config, g
from pylons import config
from ckan import model, __version__
from ckan.lib.helpers import url_for

Expand Down Expand Up @@ -51,7 +51,8 @@ def _mail_recipient(recipient_name, recipient_email,
def mail_recipient(recipient_name, recipient_email, subject,
body, headers={}):
return _mail_recipient(recipient_name, recipient_email,
g.site_title, g.site_url, subject, body, headers=headers)
config.get('ckan.site_title'), config.get('ckan.site_url'),
subject, body, headers=headers)

def mail_user(recipient, subject, body, headers={}):
if (recipient.email is None) or not len(recipient.email):
Expand All @@ -76,7 +77,7 @@ def create_reset_key(user):
model.repo.commit_and_remove()

def get_reset_link(user):
return urljoin(g.site_url,
return urljoin(config.get('ckan.site_url'),
url_for(controller='user',
action='perform_reset',
id=user.id,
Expand All @@ -85,7 +86,7 @@ def get_reset_link(user):
def get_reset_link_body(user):
d = {
'reset_link': get_reset_link(user),
'site_title': g.site_title
'site_title': config.get('ckan.site_title')
}
return RESET_LINK_MESSAGE % d

Expand Down

0 comments on commit ed221a2

Please sign in to comment.