fix: safe_markdown throw KeyError exception #192

agusmakmun · Feb 15, 2023 · b72bec2 · b72bec2
1 parent d3a6189
commit b72bec2
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 19 deletions.
diff --git a/martor/__init__.py b/martor/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__VERSION__ = "1.6.17"
+__VERSION__ = "1.6.18"
 __RELEASE_DATE__ = "15-Feb-2023"
 __AUTHOR__ = "Agus Makmun (Summon Agus)"
 __AUTHOR_EMAIL__ = "summon.agus@gmail.com"
diff --git a/martor/static/martor/css/martor-admin.min.css b/martor/static/martor/css/martor-admin.min.css
diff --git a/martor/static/martor/css/martor.bootstrap.min.css b/martor/static/martor/css/martor.bootstrap.min.css
diff --git a/martor/static/martor/css/martor.semantic.min.css b/martor/static/martor/css/martor.semantic.min.css
diff --git a/martor/static/martor/js/martor.bootstrap.js b/martor/static/martor/js/martor.bootstrap.js
@@ -1,5 +1,5 @@
 /**
- * Name         : Martor v1.6.17
+ * Name         : Martor v1.6.18
  * Created by   : Agus Makmun (Summon Agus)
  * Release date : 15-Feb-2023
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007

diff --git a/martor/static/martor/js/martor.bootstrap.min.js b/martor/static/martor/js/martor.bootstrap.min.js
diff --git a/martor/static/martor/js/martor.semantic.js b/martor/static/martor/js/martor.semantic.js
@@ -1,5 +1,5 @@
 /**
- * Name         : Martor v1.6.17
+ * Name         : Martor v1.6.18
  * Created by   : Agus Makmun (Summon Agus)
  * Release date : 15-Feb-2023
  * License      : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007

diff --git a/martor/static/martor/js/martor.semantic.min.js b/martor/static/martor/js/martor.semantic.min.js
diff --git a/martor/utils.py b/martor/utils.py
@@ -2,8 +2,6 @@
 import bleach
 
 from django.utils.functional import Promise
-from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 from django.core.serializers.json import DjangoJSONEncoder
 
 try:
@@ -48,15 +46,11 @@ def markdownify(markdown_text):
         extensions=MARTOR_MARKDOWN_EXTENSIONS,
         extension_configs=MARTOR_MARKDOWN_EXTENSION_CONFIGS,
     )
-    return format_html(
-        mark_safe(
-            bleach.clean(
-                html,
-                tags=ALLOWED_HTML_TAGS,
-                attributes=ALLOWED_HTML_ATTRIBUTES,
-                protocols=ALLOWED_URL_SCHEMES,
-            )
-        )
+    return bleach.clean(
+        html,
+        tags=ALLOWED_HTML_TAGS,
+        attributes=ALLOWED_HTML_ATTRIBUTES,
+        protocols=ALLOWED_URL_SCHEMES,
     )