wiki: Borrow markdown rendering from blog

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

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 4a782a8e03cd66721a124ea3c0ab65b258d8bde4..4d1e8f82e648f487e42e0abd23ad2595776d3c07 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -1,25 +1,12 @@
 #!/usr/bin/python3
 
 import logging
-import markdown2
 import os.path
 import re
 
 from . import misc
 from .decorators import *
 
-# Used to automatically link some things
-link_patterns = (
-       # Find bug reports
-       (re.compile(r"(?:#(\d+))", re.I), r"https://bugzilla.ipfire.org/show_bug.cgi?id=\1"),
-
-       # Email Addresses
-       (re.compile(r"([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)"), r"mailto:\1"),
-
-       # CVE Numbers
-       (re.compile(r"(?:CVE)[\s\-](\d{4}\-\d+)"), r"https://cve.mitre.org/cgi-bin/cvename.cgi?name=\1"),
-)
-
 class Wiki(misc.Object):
        def _get_pages(self, query, *args):
                res = self.db.query(query, *args)
@@ -147,8 +134,8 @@ class Page(misc.Object):
        def _render(self, text):
                logging.debug("Rendering %s" % self)
 
-               return markdown2.markdown(text, link_patterns=link_patterns,
-                       extras=["footnotes", "link-patterns", "wiki-tables"])
+               # Borrow this from the blog
+               return self.backend.blog._render_text(text, lang="markdown")
 
        @property
        def markdown(self):