Revert "[#1635] Remove pylons.g from lib/mailer.py"

This reverts commit ed221a2. The
changes are no longer necessary now that send-email-notifications is no
longer a paster command, and ckan is better off without these changes
because g.site_title etc. can be database-defined whereas
config.get('site_title') cannot.

ckan/lib/mailer.py

@@ -8,7 +8,7 @@
 from urlparse import urljoin
 
 from pylons.i18n.translation import _
-from pylons import config
+from pylons import config, g
 from ckan import model, __version__
 from ckan.lib.helpers import url_for
 import paste.deploy.converters
@@ -89,8 +89,7 @@ def _mail_recipient(recipient_name, recipient_email,
 def mail_recipient(recipient_name, recipient_email, subject,
         body, headers={}):
     return _mail_recipient(recipient_name, recipient_email,
-            config.get('ckan.site_title'), config.get('ckan.site_url'),
-            subject, body, headers=headers)
+            g.site_title, g.site_url, subject, body, headers=headers)
 
 def mail_user(recipient, subject, body, headers={}):
     if (recipient.email is None) or not len(recipient.email):
@@ -115,7 +114,7 @@ def create_reset_key(user):
     model.repo.commit_and_remove()
 
 def get_reset_link(user):
-    return urljoin(config.get('ckan.site_url'),
+    return urljoin(g.site_url,
                    url_for(controller='user',
                            action='perform_reset',
                            id=user.id,
@@ -124,7 +123,7 @@ def get_reset_link(user):
 def get_reset_link_body(user):
     d = {
         'reset_link': get_reset_link(user),
-        'site_title': config.get('ckan.site_title')
+        'site_title': g.site_title
         }
     return RESET_LINK_MESSAGE % d