From 15ab5c19fdf7464076bc3e14895e92fc81c60b63 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 24 Mar 2015 16:55:40 +0530
Subject: [PATCH] fixes in scrubbing url

---
 frappe/__init__.py           | 4 ++--
 frappe/public/css/desk.css   | 1 -
 frappe/public/less/desk.less | 2 +-
 frappe/utils/jinja.py        | 3 +--
 frappe/website/render.py     | 1 -
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 0c2c42fcf4..fbb49f254d 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -868,9 +868,9 @@ def add_version(doc):
 		"doclist_json": as_json(doc.as_dict())
 	}).insert(ignore_permissions=True)
 
-def as_json(obj):
+def as_json(obj, indent=1):
 	from frappe.utils.response import json_handler
-	return json.dumps(obj, indent=1, sort_keys=True, default=json_handler)
+	return json.dumps(obj, indent=indent, sort_keys=True, default=json_handler)
 
 def get_test_records(doctype):
 	"""Returns list of objects from `test_records.json` in the given doctype's folder."""
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 76c72eeb03..9fd77c7712 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -254,7 +254,6 @@ a.form-link {
   max-height: 200px;
   background-color: #fffce7;
   border: 1px solid #d1d8dd;
-  word-break: break-all;
   overflow-y: auto;
   position: relative;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 9f2a7b4189..0825b925bd 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -60,7 +60,7 @@ a.form-link {
 	background-color: @light-yellow;
 	border: 1px solid @border-color;
 
-	word-break: break-all;
+	// word-break: break-all;
 	overflow-y: auto;
 	position: relative;
 
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index bf522551cc..b3e2b4029e 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -111,11 +111,10 @@ def set_filters(jenv):
 	from frappe.utils import global_date_format, cint, cstr, flt
 	from frappe.website.utils import get_shade, with_leading_slash
 	from markdown2 import markdown
-	from json import dumps
 
 	jenv.filters["global_date_format"] = global_date_format
 	jenv.filters["markdown"] = markdown
-	jenv.filters["json"] = dumps
+	jenv.filters["json"] = frappe.as_json
 	jenv.filters["get_shade"] = get_shade
 	jenv.filters["len"] = len
 	jenv.filters["int"] = cint
diff --git a/frappe/website/render.py b/frappe/website/render.py
index c7ea9857a8..fd623a3dd0 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -141,7 +141,6 @@ def build_page(path):
 	context = get_context(path)
 
 	html = frappe.get_template(context.base_template_path).render(context)
-	html = scrub_relative_urls(html)
 
 	if can_cache(context.no_cache):
 		frappe.cache().set_value("page:{0}:{1}".format(path, frappe.local.lang), html)