Merge branch 'master' of github.com:webnotes/erpnext into unicode
diff --git a/erpnext/website/blog.py b/erpnext/website/blog.py
index 6f6cc40..87945ab 100644
--- a/erpnext/website/blog.py
+++ b/erpnext/website/blog.py
@@ -56,7 +56,7 @@
if not args: args = webnotes.form_dict
query = """\
- select name, title, left(content, 100) as content
+ select name, page_name, title, left(content, 100) as content
from tabBlog
where ifnull(published,0)=1 and
name!=%(name)s order by creation desc"""
diff --git a/erpnext/website/templates/js/blog_page.js b/erpnext/website/templates/js/blog_page.js
index 7121677..56dcf21 100644
--- a/erpnext/website/templates/js/blog_page.js
+++ b/erpnext/website/templates/js/blog_page.js
@@ -59,7 +59,7 @@
hide_refresh: true,
render_row: function(parent, data) {
if(data.content && data.content.length>=100) data.content += '...';
- parent.innerHTML = repl('<a href="%(name)s.html">%(title)s</a>\
+ parent.innerHTML = repl('<a href="%(page_name)s.html">%(title)s</a>\
<div class="comment">%(content)s</div><br>', data);
// adjust page height depending on sidebar height