(bug 13154) Adding subpage info to meta=siteinfo&siprop=namespaces. Also adding RELEA...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d41b763..67a107c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -48,6 +48,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 * Fixing main page display in meta=siteinfo
 * (bug 13128) Add patrolled flag to list=recentchanges
+* Implemented {bl,ei,iu}redirect (lists links through redirects as well)
+* (bug 13154) Introducing subpages flag to meta=siteinfo&siprop=namespaces
 
 === Languages updated in 1.13 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 8e4752a..5d51582 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -93,7 +93,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
        }
        
        protected function appendNamespaces($property) {
-               global $wgContLang;
+               global $wgContLang, $wgNamespacesWithSubpages;
                
                $data = array ();
                foreach ($wgContLang->getFormattedNamespaces() as $ns => $title) {
@@ -101,6 +101,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                'id' => $ns
                        );
                        ApiResult :: setContent($data[$ns], $title);
+                       if(@$wgNamespacesWithSubpages[$ns])
+                               $data[$ns]['subpages'] = '';
                }
                
                $this->getResult()->setIndexedTagName($data, 'ns');