diff --git a/patches/december_2012/website_cache_refactor.py b/patches/december_2012/website_cache_refactor.py index 3214345557..5a1f22e604 100644 --- a/patches/december_2012/website_cache_refactor.py +++ b/patches/december_2012/website_cache_refactor.py @@ -11,11 +11,11 @@ def execute(): from markdown2 import markdown for page in webnotes.conn.sql("""select name, main_section from `tabWeb Page`"""): - m = markdown(page[1]).encode("utf8") + m = markdown(page[1] or "").encode("utf8") webnotes.conn.set_value("Web Page", page[0], "main_section", m) for page in webnotes.conn.sql("""select name, content from `tabBlog`"""): - m = markdown(page[1]).encode("utf8") + m = markdown(page[1] or "").encode("utf8") webnotes.conn.set_value("Blog", page[0], "content", m) # delete website cache diff --git a/website/web_cache.py b/website/web_cache.py index 60672d8b7c..a1ab2b99bf 100644 --- a/website/web_cache.py +++ b/website/web_cache.py @@ -22,6 +22,7 @@ import os import conf import webnotes import website.utils +from webnotes.utils import cstr template_map = { 'Web Page': 'html/web_page.html', @@ -42,7 +43,6 @@ def get_page_html(page_name, comments=''): comments += "\n\npage load status: cache" # insert comments - import webnotes.utils html += """\n""" % webnotes.utils.cstr(comments) return html