From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Jul 2019 13:47:10 +0000 (+0100)
Subject: wiki: Swap markdown module to default python module
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9c6d581f686b3a4af4da5dc725aaa249b9c69cf;p=ipfire.org.git

wiki: Swap markdown module to default python module

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/requirements.txt b/requirements.txt
index 962793c0..49608463 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ html5lib==1.0.1
 idna==2.7
 iso3166==0.9
 ldap3==2.5.1
-markdown2==2.3.6
+Markdown==3.1.1
 oauthlib==3.0.1
 phonenumbers==8.9.15
 Pillow==5.3.0
diff --git a/src/backend/blog.py b/src/backend/blog.py
index 9aa39922..7536407e 100644
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -2,7 +2,7 @@
 
 import datetime
 import feedparser
-import markdown2
+import markdown
 import re
 import textile
 import tornado.gen
@@ -141,15 +141,15 @@ class Blog(misc.Object):
 
 	def _render_text(self, text, lang="markdown"):
 		if lang == "markdown":
-			return markdown2.markdown(text, link_patterns=link_patterns,
-				extras=[
-					"code-friendly",
-					"cuddled-lists",
-					"fenced-code-blocks",
+			return markdown.markdown(text, link_patterns=link_patterns,
+				extensions=[
+					"codehilite",
+					"fenced_code",
 					"footnotes",
-					"header-ids",
-					"link-patterns",
+					"nl2br",
+					"sane_lists",
 					"tables",
+					"toc",
 				])
 
 		elif lang == "textile":
diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index fb597887..feedae90 100644
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -501,7 +501,7 @@ class WikiRenderer(misc.Object):
 	links = re.compile(r"<a href=\"(.*?)\">(.*?)</a>")
 
 	# Images
-	images = re.compile(r"<img src=\"(.*?)\" alt=\"(.*?)\" (?:title=\"(.*?)\" )?/>")
+	images = re.compile(r"<img alt(?:=\"(.*?)\")? src=\"(.*?)\" (?:title=\"(.*?)\" )?/>")
 
 	def init(self, path):
 		self.path = path
@@ -531,7 +531,7 @@ class WikiRenderer(misc.Object):
 			(path, text or self.backend.wiki.get_page_title(path))
 
 	def _render_image(self, m):
-		url, alt_text, caption = m.groups()
+		alt_text, url, caption = m.groups()
 
 		# Skip any absolute and external URLs
 		if url.startswith("/") or url.startswith("https://") or url.startswith("http://"):