Merge "(bug 30836) API siteinfo specialpagealiases should not return nonexistent...

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index c85a1c3..ec50096 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -182,6 +182,7 @@ 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
 
 === Languages updated in 1.20 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 5316006..511cbe4 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -257,8 +257,9 @@ class ApiQuerySiteinfo extends ApiQueryBase {
        protected function appendSpecialPageAliases( $property ) {
                global $wgContLang;
                $data = array();
-               foreach ( $wgContLang->getSpecialPageAliases() as $specialpage => $aliases ) {
-                       $arr = array( 'realname' => $specialpage, 'aliases' => $aliases );
+               $aliases = $wgContLang->getSpecialPageAliases();
+               foreach ( SpecialPageFactory::getList() as $specialpage => $stuff ) {
+                       $arr = array( 'realname' => $specialpage, 'aliases' => $aliases[$specialpage] );
                        $this->getResult()->setIndexedTagName( $arr['aliases'], 'alias' );
                        $data[] = $arr;
                }