jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367405 )
Change subject: Hygiene: Use ExtensionRegistry to manage skin dependencies
......................................................................
Hygiene: Use ExtensionRegistry to manage skin dependencies
Changes:
- removed MobileFrontend existence check from MinervaHooks
- added MobileFrontend as a requirement inside skin.json
Additional benefit: Skin will work only with MobileFrontend v2.0.0
and higher.
Change-Id: I1f2f5de3dbc0cf5159a06bc8f47e1cf401a2fcdb
---
M includes/Minerva.hooks.php
M skin.json
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index 9f8c73e..554c749 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -35,9 +35,6 @@
global $wgResourceLoaderLESSImportPaths;
$wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) .
"/minerva.less/";
- if ( !ExtensionRegistry::getInstance()->isLoaded(
'MobileFrontend' ) ) {
- die( 'This version of the Minerva skin requires
MobileFrontend' );
- }
// Setup alias for compatibility with SkinMinervaNeue.
if ( !class_exists( 'SkinMinervaNeue' ) ) {
class_alias( 'SkinMinerva', 'SkinMinervaNeue', true );
diff --git a/skin.json b/skin.json
index 5bb2f25..8f6f52f 100644
--- a/skin.json
+++ b/skin.json
@@ -544,7 +544,10 @@
"name": "MinervaNeue",
"namemsg": "skinname-minerva",
"requires": {
- "MediaWiki": ">= 1.25.0"
+ "MediaWiki": ">= 1.25.0",
+ "extensions": {
+ "MobileFrontend": ">= 2.0.0"
+ }
},
"type": "skin",
"url": "https://www.mediawiki.org/wiki/Skin:MinervaNeue";,
--
To view, visit https://gerrit.wikimedia.org/r/367405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f2f5de3dbc0cf5159a06bc8f47e1cf401a2fcdb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
