jenkins-bot has submitted this change and it was merged.

Change subject: Replace deprecated $wgSpecialPageGroups
......................................................................


Replace deprecated $wgSpecialPageGroups

$wgSpecialPageGroups is deprecated since 1.21
override SpecialPage::getGroupName instead

Change-Id: Id7b6e613b31faa511362d0a7a75df88c15dcaafa
---
M FlaggedRevs.setup.php
M frontend/FlaggedRevsUI.setup.php
M frontend/specialpages/reports/ConfiguredPages_body.php
M frontend/specialpages/reports/PendingChanges_body.php
M frontend/specialpages/reports/ProblemChanges_body.php
M frontend/specialpages/reports/QualityOversight_body.php
M frontend/specialpages/reports/ReviewedPages_body.php
M frontend/specialpages/reports/StablePages_body.php
M frontend/specialpages/reports/UnreviewedPages_body.php
M frontend/specialpages/reports/ValidationStatistics_body.php
10 files changed, 35 insertions(+), 12 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FlaggedRevs.setup.php b/FlaggedRevs.setup.php
index fe918fe..9504d06 100755
--- a/FlaggedRevs.setup.php
+++ b/FlaggedRevs.setup.php
@@ -365,10 +365,10 @@
         * @return void
         */
        public static function setSpecialPages() {
-               global $wgSpecialPages, $wgSpecialPageGroups, 
$wgSpecialPageCacheUpdates;
+               global $wgSpecialPages, $wgSpecialPageCacheUpdates;
 
                FlaggedRevsUISetup::defineSpecialPages(
-                       $wgSpecialPages, $wgSpecialPageGroups, 
$wgSpecialPageCacheUpdates );
+                       $wgSpecialPages, $wgSpecialPageCacheUpdates );
        }
 
        /**
diff --git a/frontend/FlaggedRevsUI.setup.php b/frontend/FlaggedRevsUI.setup.php
index 5b3b042..3fe5f2d 100644
--- a/frontend/FlaggedRevsUI.setup.php
+++ b/frontend/FlaggedRevsUI.setup.php
@@ -92,11 +92,10 @@
        /**
         * Register FlaggedRevs special pages as needed.
         * @param $pages Array $wgSpecialPages (list of special pages)
-        * @param $groups Array $wgSpecialPageGroups (assoc array of special 
page groups)
         * @param $updates Array $wgSpecialPageCacheUpdates (assoc array of 
special page updaters)
         * @return void
         */
-       public static function defineSpecialPages( array &$pages, array 
&$groups, array &$updates ) {
+       public static function defineSpecialPages( array &$pages, array 
&$updates ) {
                global $wgFlaggedRevsProtection, $wgFlaggedRevsNamespaces, 
$wgUseTagFilter;
 
                // Show special pages only if FlaggedRevs is enabled on some 
namespaces
@@ -104,31 +103,23 @@
                        $pages['RevisionReview'] = 'RevisionReview'; // unlisted
                        $pages['ReviewedVersions'] = 'ReviewedVersions'; // 
unlisted
                        $pages['PendingChanges'] = 'PendingChanges';
-                       $groups['PendingChanges'] = 'quality';
                        // Show tag filtered pending edit page if there are tags
                        if ( $wgUseTagFilter ) {
                                $pages['ProblemChanges'] = 'ProblemChanges';
-                               $groups['ProblemChanges'] = 'quality';
                        }
                        if ( !$wgFlaggedRevsProtection ) {
                                $pages['ReviewedPages'] = 'ReviewedPages';
-                               $groups['ReviewedPages'] = 'quality';
                                $pages['UnreviewedPages'] = 'UnreviewedPages';
-                               $groups['UnreviewedPages'] = 'quality';
                                $updates['UnreviewedPages'] = 
'UnreviewedPages::updateQueryCache';
                        }
                        $pages['QualityOversight'] = 'QualityOversight';
-                       $groups['QualityOversight'] = 'quality';
                        $pages['ValidationStatistics'] = 'ValidationStatistics';
-                       $groups['ValidationStatistics'] = 'quality';
                        $updates['ValidationStatistics'] = 
'FlaggedRevsStats::updateCache';
                        // Protect levels define allowed stability settings
                        if ( $wgFlaggedRevsProtection ) {
                                $pages['StablePages'] = 'StablePages';
-                               $groups['StablePages'] = 'quality';
                        } else {
                                $pages['ConfiguredPages'] = 'ConfiguredPages';
-                               $groups['ConfiguredPages'] = 'quality';
                                $pages['Stabilization'] = 'Stabilization'; // 
unlisted
                        }
                }
diff --git a/frontend/specialpages/reports/ConfiguredPages_body.php 
b/frontend/specialpages/reports/ConfiguredPages_body.php
index a705a35..0898d84 100644
--- a/frontend/specialpages/reports/ConfiguredPages_body.php
+++ b/frontend/specialpages/reports/ConfiguredPages_body.php
@@ -105,6 +105,10 @@
                return "<li>{$link} ({$config}) <b>[$default]</b> " .
                        "{$restr}<i>{$expiry_description}</i></li>";
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/PendingChanges_body.php 
b/frontend/specialpages/reports/PendingChanges_body.php
index c593e53..2c379f7 100644
--- a/frontend/specialpages/reports/PendingChanges_body.php
+++ b/frontend/specialpages/reports/PendingChanges_body.php
@@ -289,6 +289,10 @@
                        return "";
                }
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/ProblemChanges_body.php 
b/frontend/specialpages/reports/ProblemChanges_body.php
index 3ab50cb..5aa8af3 100644
--- a/frontend/specialpages/reports/ProblemChanges_body.php
+++ b/frontend/specialpages/reports/ProblemChanges_body.php
@@ -280,6 +280,10 @@
                else
                        return "";
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/QualityOversight_body.php 
b/frontend/specialpages/reports/QualityOversight_body.php
index f96cfec..de10f2d 100644
--- a/frontend/specialpages/reports/QualityOversight_body.php
+++ b/frontend/specialpages/reports/QualityOversight_body.php
@@ -147,4 +147,8 @@
                }
                return $showActions;
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
diff --git a/frontend/specialpages/reports/ReviewedPages_body.php 
b/frontend/specialpages/reports/ReviewedPages_body.php
index c2a005c..bd75cdf 100644
--- a/frontend/specialpages/reports/ReviewedPages_body.php
+++ b/frontend/specialpages/reports/ReviewedPages_body.php
@@ -115,6 +115,10 @@
 
                return "<li>$link $dirmark $stxt ($list)$best</li>";
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/StablePages_body.php 
b/frontend/specialpages/reports/StablePages_body.php
index 03c082a..7e2814d 100644
--- a/frontend/specialpages/reports/StablePages_body.php
+++ b/frontend/specialpages/reports/StablePages_body.php
@@ -101,6 +101,10 @@
                $utilLinks = $this->getLanguage()->pipeList( $utilLinks );
                return "<li>{$link} ({$utilLinks}) 
{$restr}<i>{$expiry_description}</i></li>";
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/UnreviewedPages_body.php 
b/frontend/specialpages/reports/UnreviewedPages_body.php
index 9204a48..53f677e 100644
--- a/frontend/specialpages/reports/UnreviewedPages_body.php
+++ b/frontend/specialpages/reports/UnreviewedPages_body.php
@@ -277,6 +277,10 @@
                        __METHOD__ );
                $dbw->commit();
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }
 
 /**
diff --git a/frontend/specialpages/reports/ValidationStatistics_body.php 
b/frontend/specialpages/reports/ValidationStatistics_body.php
index 48aef40..8d74b8b 100644
--- a/frontend/specialpages/reports/ValidationStatistics_body.php
+++ b/frontend/specialpages/reports/ValidationStatistics_body.php
@@ -330,4 +330,8 @@
 
                return $data;
        }
+
+       protected function getGroupName() {
+               return 'quality';
+       }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/211286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7b6e613b31faa511362d0a7a75df88c15dcaafa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to