From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Jul 2023 15:36:11 +0000 (+0000)
Subject: wiki: Fix handling @ in links
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=825e03a077b715d60f61d52fb9e82acc044aeb68;p=ipfire.org.git

wiki: Fix handling @ in links

Fixes: #12704 - Wiki doesn't like `@` in http url
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index c8a8ff8d..817f81c8 100644
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -586,6 +586,12 @@ class WikiRenderer(misc.Object):
 	def _render_link(self, m):
 		url, text = m.groups()
 
+		# External Links
+		for schema in self.schemas:
+			if url.startswith(schema):
+				return """<a class="link-external" href="%s">%s</a>""" % \
+					(url, text or url)
+
 		# Emails
 		if "@" in url:
 			# Strip mailto:
@@ -595,12 +601,6 @@ class WikiRenderer(misc.Object):
 			return """<a class="link-external" href="mailto:%s">%s</a>""" % \
 				(url, text or url)
 
-		# External Links
-		for schema in self.schemas:
-			if url.startswith(schema):
-				return """<a class="link-external" href="%s">%s</a>""" % \
-					(url, text or url)
-
 		# Everything else must be an internal link
 		path = self.backend.wiki.make_path(self.path, url)