From 121f6f0bf84a01f91c45a3940c400f721dd9affa Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 2 Mar 2022 11:48:41 +0100
Subject: [PATCH] Bugfix: strip utm_ tracking failed

---
 dev/Common/Html.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index e6113ebc4..3780f091c 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -16,7 +16,7 @@ const
 	replaceWithChildren = node => node.replaceWith(...[...node.childNodes]),
 
 	// Strip utm_* tracking
-	stripTracking = text => text.replace(/(\?|&amp;|&)utm_[a-z]+=[^&?#]*/si, '$1');
+	stripTracking = text => text.replace(/([?&])utm_[a-z]+=[^&?#]*/gsi, '$1').replace(/&&+/, '');
 
 export const
 
@@ -184,11 +184,11 @@ export const
 
 			else if ('A' === name) {
 				value = oElement.href;
-				value = stripTracking(value);
 				if (!/^([a-z]+):/i.test(value)) {
 					setAttribute('data-x-broken-href', value);
 					delAttribute('href');
 				} else {
+					oElement.href = stripTracking(value);
 					setAttribute('target', '_blank');
 					setAttribute('rel', 'external nofollow noopener noreferrer');
 				}