Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/utilities/page/messages/messages.py b/utilities/page/messages/messages.py
index b46e03c..afe4e78 100644
--- a/utilities/page/messages/messages.py
+++ b/utilities/page/messages/messages.py
@@ -95,7 +95,7 @@
fn = webnotes.user.name
url = get_url()
- message = '''You have a message by <b>%s</b>:
+ message = '''You have a message from <b>%s</b>:
%s
@@ -106,7 +106,7 @@
sender = webnotes.user.name!='Administrator' and webnotes.user.name or 'support+admin_post@erpnext.com'
from webnotes.utils.email_lib import sendmail
- sendmail([arg['contact']], sender, message, fn + ' has posted a new comment')
+ sendmail([arg['contact']], sender, message, "You have a message from %s" % (fn,))
def get_url():
from webnotes.utils import get_request_site_address
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index b294f90..6567910 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import webnotes
+import website.utils
@webnotes.whitelist(allow_guest=True)
def get_blog_list(args=None):