]> git.ipfire.org Git - ipfire.org.git/commitdiff
wiki: Allow relative links to have a description, too
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Apr 2019 12:16:15 +0000 (13:16 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Apr 2019 12:16:47 +0000 (13:16 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/backend/wiki.py

index 746d1f3ee6e79a383831a45db45a346075e7f9d2..2761f38e35ffdd7f6bed6f377872c9a26dfdbcdc 100644 (file)
@@ -289,7 +289,7 @@ class Page(misc.Object):
 
                # Add wiki links
                patterns = (
-                       (r"\[\[([\w\d\/]+)(?:\|([\w\d\s]+))\]\]", r"/\1", r"\2", None),
+                       (r"\[\[([\w\d\/\-\.]+)(?:\|([\w\d\s]+))\]\]", r"\1", r"\2", None),
                        (r"\[\[([\w\d\/\-\.]+)\]\]", r"\1", r"\1", self.backend.wiki.get_page_title),
                )