From 09ac11f0d1f5b2b0fae241d67a7aee0c8f0750c0 Mon Sep 17 00:00:00 2001 From: jeroendedauw Date: Thu, 15 Oct 2015 17:36:33 +0200 Subject: [PATCH] Match MW 1.27 changes to $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Based on https://github.com/SemanticMediaWiki/SemanticMediaWiki/commit/81938804441ade68dbdfb9273644778f45fe8df1 by @umherirrender --- includes/specials/SMW_SpecialAsk.php | 4 ++++ includes/specials/SMW_SpecialBrowse.php | 4 ++++ includes/specials/SMW_SpecialOWLExport.php | 3 +++ includes/specials/SMW_SpecialPageProperty.php | 4 ++++ includes/specials/SMW_SpecialSMWAdmin.php | 3 +++ includes/specials/SMW_SpecialTypes.php | 4 ++++ includes/specials/SpecialConcepts.php | 4 ++++ includes/specials/SpecialProperties.php | 3 +++ includes/specials/SpecialSemanticStatistics.php | 4 ++++ includes/specials/SpecialUnusedProperties.php | 3 +++ includes/specials/SpecialWantedProperties.php | 3 +++ src/MediaWiki/Specials/SpecialSearchByProperty.php | 3 +++ 12 files changed, 42 insertions(+) diff --git a/includes/specials/SMW_SpecialAsk.php b/includes/specials/SMW_SpecialAsk.php index 5a25bee0f1..cb13d075aa 100644 --- a/includes/specials/SMW_SpecialAsk.php +++ b/includes/specials/SMW_SpecialAsk.php @@ -653,4 +653,8 @@ protected function getNavigationBar( SMWQueryResult $res, array $urlArgs ) { return $navigation; } + + protected function getGroupName() { + return 'smw_group'; + } } diff --git a/includes/specials/SMW_SpecialBrowse.php b/includes/specials/SMW_SpecialBrowse.php index fc96f348cc..e92db321c9 100644 --- a/includes/specials/SMW_SpecialBrowse.php +++ b/includes/specials/SMW_SpecialBrowse.php @@ -454,4 +454,8 @@ private function addExternalHelpLinkFor( $key ) { $this->addHelpLink( wfMessage( $key )->escaped(), true ); } + + protected function getGroupName() { + return 'smw_group'; + } } diff --git a/includes/specials/SMW_SpecialOWLExport.php b/includes/specials/SMW_SpecialOWLExport.php index 781f19f050..0ecbe609d2 100644 --- a/includes/specials/SMW_SpecialOWLExport.php +++ b/includes/specials/SMW_SpecialOWLExport.php @@ -189,4 +189,7 @@ protected function exportPages( $pages ) { $this->export_controller->printPages( $pages, $recursive, $date ); } + protected function getGroupName() { + return 'smw_group'; + } } diff --git a/includes/specials/SMW_SpecialPageProperty.php b/includes/specials/SMW_SpecialPageProperty.php index 00fa41bb97..0faa578e9b 100644 --- a/includes/specials/SMW_SpecialPageProperty.php +++ b/includes/specials/SMW_SpecialPageProperty.php @@ -157,4 +157,8 @@ public function execute( $query ) { $wgOut->addHTML( $html ); SMWOutputs::commitToOutputPage( $wgOut ); // make sure locally collected output data is pushed to the output! } + + protected function getGroupName() { + return 'smw_group'; + } } diff --git a/includes/specials/SMW_SpecialSMWAdmin.php b/includes/specials/SMW_SpecialSMWAdmin.php index 9d45f2a523..60744be686 100644 --- a/includes/specials/SMW_SpecialSMWAdmin.php +++ b/includes/specials/SMW_SpecialSMWAdmin.php @@ -320,4 +320,7 @@ public function encodeJson( array $input ) { return FormatJson::encode( $input, true ); } + protected function getGroupName() { + return 'smw_group'; + } } diff --git a/includes/specials/SMW_SpecialTypes.php b/includes/specials/SMW_SpecialTypes.php index 49502fd8e5..8ea602bb8c 100644 --- a/includes/specials/SMW_SpecialTypes.php +++ b/includes/specials/SMW_SpecialTypes.php @@ -132,4 +132,8 @@ protected function getTypeProperties( $typeLabel ) { return $result; } + + protected function getGroupName() { + return 'pages'; + } } diff --git a/includes/specials/SpecialConcepts.php b/includes/specials/SpecialConcepts.php index aaaf387b39..df208ca8de 100644 --- a/includes/specials/SpecialConcepts.php +++ b/includes/specials/SpecialConcepts.php @@ -113,4 +113,8 @@ public function execute( $param ) { $this->getOutput()->addHTML( $this->getHtml( $diWikiPages, $limit, $from, $until ) ); } + + protected function getGroupName() { + return 'pages'; + } } diff --git a/includes/specials/SpecialProperties.php b/includes/specials/SpecialProperties.php index 770fb1f495..b35c52184a 100644 --- a/includes/specials/SpecialProperties.php +++ b/includes/specials/SpecialProperties.php @@ -63,4 +63,7 @@ private function getLimitOffset() { return wfCheckLimits(); } + protected function getGroupName() { + return 'pages'; + } } diff --git a/includes/specials/SpecialSemanticStatistics.php b/includes/specials/SpecialSemanticStatistics.php index 88f304a74a..6ca8582f0e 100644 --- a/includes/specials/SpecialSemanticStatistics.php +++ b/includes/specials/SpecialSemanticStatistics.php @@ -47,4 +47,8 @@ public function execute( $param ) { )->parseAsBlock() ); } + + protected function getGroupName() { + return 'wiki'; + } } diff --git a/includes/specials/SpecialUnusedProperties.php b/includes/specials/SpecialUnusedProperties.php index 6913ca7c45..0ecb2badce 100644 --- a/includes/specials/SpecialUnusedProperties.php +++ b/includes/specials/SpecialUnusedProperties.php @@ -64,4 +64,7 @@ private function getLimitOffset() { return wfCheckLimits(); } + protected function getGroupName() { + return 'maintenance'; + } } diff --git a/includes/specials/SpecialWantedProperties.php b/includes/specials/SpecialWantedProperties.php index f9a3e84bbf..5f22104d88 100644 --- a/includes/specials/SpecialWantedProperties.php +++ b/includes/specials/SpecialWantedProperties.php @@ -65,4 +65,7 @@ private function getLimitOffset() { return wfCheckLimits(); } + protected function getGroupName() { + return 'maintenance'; + } } diff --git a/src/MediaWiki/Specials/SpecialSearchByProperty.php b/src/MediaWiki/Specials/SpecialSearchByProperty.php index d662b0f7be..5e96ffd52b 100644 --- a/src/MediaWiki/Specials/SpecialSearchByProperty.php +++ b/src/MediaWiki/Specials/SpecialSearchByProperty.php @@ -84,4 +84,7 @@ private function getLimitOffset() { return wfCheckLimits(); } + protected function getGroupName() { + return 'smw_group'; + } }