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

Change subject: SpecialWikiSets: always sort wpWikis alphabetically
......................................................................


SpecialWikiSets: always sort wpWikis alphabetically

Bug: T36874
Change-Id: I93c719d10acb1f9c82cd3234a519d9f1e5813e3a
---
M includes/specials/SpecialWikiSets.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/specials/SpecialWikiSets.php 
b/includes/specials/SpecialWikiSets.php
index 87c7d78..db52455 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -121,10 +121,10 @@
                        $type = $set ? $set->getType() : WikiSet::OPTIN;
                }
                if ( !$wikis ) {
-                       $wikis = implode( "\n", $set ? $set->getWikisRaw() : 
array() );
-               } else {
-                       $wikis = implode( "\n", $wikis );
+                       $wikis = $set ? $set->getWikisRaw() : array();
                }
+               sort( $wikis );
+               $wikis = implode( "\n", $wikis );
                $url = SpecialPage::getTitleFor( 'WikiSets', $subpage 
)->getLocalUrl();
                if ( $this->mCanEdit ) {
                        // Give grep a chance to find the usages:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93c719d10acb1f9c82cd3234a519d9f1e5813e3a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Glaisher <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MarcoAurelio <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to