From 7afa180a4bd3fa02ec9b8a7aecd9fac866dab757 Mon Sep 17 00:00:00 2001
From: CosmicAlpha <cosmic.alpha24@gmail.com>
Date: Mon, 26 Feb 2024 15:50:53 -0700
Subject: [PATCH 1/3] Use Html::encodeJsVar

---
 includes/MatomoAnalyticsHooks.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/MatomoAnalyticsHooks.php b/includes/MatomoAnalyticsHooks.php
index d14d836..0979303 100644
--- a/includes/MatomoAnalyticsHooks.php
+++ b/includes/MatomoAnalyticsHooks.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
 
 class MatomoAnalyticsHooks {
@@ -55,8 +56,8 @@ public static function matomoScript( $skin, &$text ) {
 		$serverurl = $config->get( 'MatomoAnalyticsServerURL' );
 		$title = $skin->getRelevantTitle();
 
-		$jstitle = Xml::encodeJsVar( $title->getPrefixedText() );
-		$dbname = Xml::encodeJsVar( $config->get( 'DBname' ) );
+		$jstitle = Html::encodeJsVar( $title->getPrefixedText() );
+		$dbname = Html::encodeJsVar( $config->get( 'DBname' ) );
 		$urltitle = $title->getPrefixedURL();
 		$userType = $user->isRegistered() ? 'User' : 'Anonymous';
 		$cookieDisable = (int)$config->get( 'MatomoAnalyticsDisableCookie' );

From 006e0f53bcd83eb5e0edee3bfea389764774fae8 Mon Sep 17 00:00:00 2001
From: CosmicAlpha <cosmic.alpha24@gmail.com>
Date: Mon, 26 Feb 2024 15:51:28 -0700
Subject: [PATCH 2/3] Bump

---
 extension.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension.json b/extension.json
index c1844ed..f546f84 100644
--- a/extension.json
+++ b/extension.json
@@ -6,12 +6,12 @@
 		"Universal Omega"
 	],
 	"url": "https://github.com/miraheze/MatomoAnalytics",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"descriptionmsg": "matomoanalytics-desc",
 	"license-name": "GPL-3.0-or-later",
 	"type": "specialpage",
 	"requires": {
-		"MediaWiki": ">= 1.39.0"
+		"MediaWiki": ">= 1.41.0"
 	},
 	"AvailableRights": [
 		"noanalytics"

From 3a0777bccd12a41e84e9608cfde6687e7c59eabc Mon Sep 17 00:00:00 2001
From: CosmicAlpha <cosmic.alpha24@gmail.com>
Date: Mon, 26 Feb 2024 15:53:01 -0700
Subject: [PATCH 3/3] Add entry

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b05ea4e..913d9ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## ChangeLog for MatomoAnalytics
 
+### 1.1.3 (26-02-2024)
+* Replace deprecated Xml::encodeJsVar with Html::encodeJsVar
+* Now requires MediaWiki 1.41.0 or later
+
 ### 1.1.2 (04-02-2023)
 * Add a CleanupMatomos maintenance script
 * Add requireExtension() to all maintenance scripts