From 39080a18dda2aaa4d6719a3ae1d8b854b0ff6674 Mon Sep 17 00:00:00 2001 From: Reedy Date: Wed, 18 Jul 2012 16:39:48 +0000 Subject: [PATCH] Revert "(bug 30836) API siteinfo specialpagealiases should not return nonexistent special pages" Caused Bug 38464 - API showing internal error with ?action=query&meta=siteinfo&siprop=specialpagealiases&format=xmlfm This reverts commit 48523016ef0d4a3d15e7417dfb3048d34cac69f7 Change-Id: I470e87d21d98d4436bd5e27d0a3796559f9c41bb --- RELEASE-NOTES-1.20 | 1 - includes/api/ApiQuerySiteinfo.php | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index 37d4411337..8bebaaacc4 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -190,7 +190,6 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki. * (bug 32381) Allow descending order for list=backlinks, list=embeddedin and list=imageusage. * (bug 32383) Allow descending order for list=langbacklinks. * API meta=siteinfo can now return the list of known variable IDs. -* (bug 30836) siteinfo prop=specialpagealiases will no longer return nonexistent special pages. * (bug 35980) list=deletedrevs now honors drdir correctly in "all" mode (mode #3). * (bug 29290) API avoids mangling fields in continuation parameters * (bug 36987) API avoids mangling fields in continuation parameters diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index 511cbe48f4..5316006031 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -257,9 +257,8 @@ class ApiQuerySiteinfo extends ApiQueryBase { protected function appendSpecialPageAliases( $property ) { global $wgContLang; $data = array(); - $aliases = $wgContLang->getSpecialPageAliases(); - foreach ( SpecialPageFactory::getList() as $specialpage => $stuff ) { - $arr = array( 'realname' => $specialpage, 'aliases' => $aliases[$specialpage] ); + foreach ( $wgContLang->getSpecialPageAliases() as $specialpage => $aliases ) { + $arr = array( 'realname' => $specialpage, 'aliases' => $aliases ); $this->getResult()->setIndexedTagName( $arr['aliases'], 'alias' ); $data[] = $arr; } -- 2.20.1