Merge branch 'v7.2.0-beta' into develop

2016-12-21 14:53:51 +05:30 · 2016-12-21 14:53:51 +05:30 · a4dc85d2c9
commit a4dc85d2c9
parent 3c71cb0c3e 7dd822aeb6
2 changed files with 6 additions and 1 deletions
--- a/frappe/docs/user/en/guides/reports-and-printing/index.md
+++ b/frappe/docs/user/en/guides/reports-and-printing/index.md
@ -1 +1,3 @@
 # Reports and Printing
+
+{index}
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@ -46,7 +46,10 @@ def make_page_context(path):
 		raise frappe.DoesNotExistError

 	context.doctype = context.ref_doctype
-	context.title = context.page_title
+
+	if context.page_title:
+		context.title = context.page_title
+
 	context.pathname = frappe.local.path

 	return context