From 40292454da48ec07635ee3c1dc77dbf9eed6cba2 Mon Sep 17 00:00:00 2001 From: Matthew Scragg Date: Wed, 10 Sep 2014 10:53:22 -0500 Subject: [PATCH] allow '{' and '}' in html urls --- realms/modules/wiki/models.py | 4 ++++ realms/static/js/main.js | 1 + 2 files changed, 5 insertions(+) diff --git a/realms/modules/wiki/models.py b/realms/modules/wiki/models.py index bc72b95..f72de1a 100644 --- a/realms/modules/wiki/models.py +++ b/realms/modules/wiki/models.py @@ -109,6 +109,10 @@ class Wiki(): # Handlebars partial ">" content = re.sub(r"\{\{>(.*?)\}\}", r'{{>\1}}', content) + # Handlebars, allow {{}} inside HTML links + content = content.replace("%7B", "{") + content = content.replace("%7D", "}") + content = re.sub(r"```(.*?)```", unescape_repl, content, flags=re.DOTALL) cname = to_canonical(name) diff --git a/realms/static/js/main.js b/realms/static/js/main.js index e2e1e11..180d438 100644 --- a/realms/static/js/main.js +++ b/realms/static/js/main.js @@ -71,6 +71,7 @@ var MDR = { } catch(e) { return this.md; } + if (sanitize) { // Causes some problems with inline styles html = html_sanitize(html, function(url) {