From 045ea3db96d6278105d5cff9fcff09eb5de2a8b8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Nov 2018 21:55:58 +0000 Subject: [PATCH] wiki: Borrow markdown rendering from blog Signed-off-by: Michael Tremer --- src/backend/wiki.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/backend/wiki.py b/src/backend/wiki.py index 4a782a8e..4d1e8f82 100644 --- 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): -- 2.39.2