From 30986e6d9ee71e2b9fa0e8a0de360534bd3312c8 Mon Sep 17 00:00:00 2001 From: Abijeet Date: Mon, 10 Jan 2022 16:46:46 +0530 Subject: [PATCH] Remove backward compatibility for MW <= 1.35 Bug: T298856 Change-Id: I1e635785d0a29d87f510e729b11fce9a2eb68e11 --- extension.json | 2 +- includes/Hooks.php | 35 ++++++++++++----------------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/extension.json b/extension.json index a0f25f02..f95f4753 100644 --- a/extension.json +++ b/extension.json @@ -17,7 +17,7 @@ "descriptionmsg": "uls-desc", "license-name": "GPL-2.0-or-later OR MIT", "requires": { - "MediaWiki": ">= 1.35.0" + "MediaWiki": ">= 1.36.0" }, "Hooks": { "BeforePageDisplay": "main", diff --git a/includes/Hooks.php b/includes/Hooks.php index 15644c8c..f3aaf4cd 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -277,29 +277,18 @@ class Hooks implements // The element id will be 'pt-uls' $langCode = $context->getLanguage()->getCode(); - if ( version_compare( MW_VERSION, '1.36', '<' ) ) { - return [ - 'uls' => [ - 'text' => $this->languageNameUtils->getLanguageName( $langCode ), - 'href' => '#', - 'class' => 'uls-trigger', - 'active' => true - ] - ] + $personal_urls; - } else { - return [ - 'uls' => [ - 'text' => $this->languageNameUtils->getLanguageName( $langCode ), - 'href' => '#', - // Skin meta data to allow skin (e.g. Vector) to add icons - 'icon' => 'wikimedia-language', - // Skin meta data to allow skin (e.g. Vector) to convert to button. - 'button' => true, - 'link-class' => [ 'uls-trigger' ], - 'active' => true - ] - ] + $personal_urls; - } + return [ + 'uls' => [ + 'text' => $this->languageNameUtils->getLanguageName( $langCode ), + 'href' => '#', + // Skin meta data to allow skin (e.g. Vector) to add icons + 'icon' => 'wikimedia-language', + // Skin meta data to allow skin (e.g. Vector) to convert to button. + 'button' => true, + 'link-class' => [ 'uls-trigger' ], + 'active' => true + ] + ] + $personal_urls; } /**