Use Html::encodeJsVar (miraheze#116)

fuerthwiki · Feb 26, 2024 · a2a2516 · a2a2516
1 parent e63a479
commit a2a2516
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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

diff --git 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"

diff --git 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' );