1 files changed, 5 insertions, 1 deletions

diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index 4a97eb7ac4..99fd4cf287 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
@@ -25,6 +25,7 @@ from django import template
 from django.utils import timezone
 from django.template.defaultfilters import filesizeformat
 import json as JsonLib
+from django.utils.safestring import mark_safe
 
 register = template.Library()
 
@@ -49,7 +50,10 @@ def mapselect(value, argument):
 
 @register.filter(name = "json")
 def json(value):
-    return JsonLib.dumps(value)
+    # JSON spec says that "\/" is functionally identical to "/" to allow for HTML-tag embedding in JSON strings
+    # unfortunately, I can't find any option in the json module to turn on forward-slash escaping, so we do
+    # it manually here
+    return mark_safe(JsonLib.dumps(value, ensure_ascii=False).replace('</', '<\\/'))
 
 @register.assignment_tag
 def query(qs, **kwargs):