API: Self-revert r42811 (BREAKING CHANGE: Putting meta=siteinfo output in <siteinfo...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e91546e..0582a7b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -379,7 +379,6 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 16105) Image metadata attributes containing spaces result in invalid XML
 * (bug 16126) Added siprop=magicwords to meta=siteinfo
 * (bug 16159) Added wlshow=patrolled|!patrolled to list=watchlist
-* Put meta=siteinfo output in <siteinfo> element
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 5d03994..e0d045f 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -120,7 +120,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $data['timezone'] = $tz;
                $data['timeoffset'] = $offset;
 
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        protected function appendNamespaces( $property ) {
@@ -137,7 +137,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                }
 
                $this->getResult()->setIndexedTagName( $data, 'ns' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        protected function appendNamespaceAliases( $property ) {
@@ -152,7 +152,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                }
 
                $this->getResult()->setIndexedTagName( $data, 'ns' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        protected function appendSpecialPageAliases( $property ) {
@@ -165,7 +165,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $data[] = $arr;
                }
                $this->getResult()->setIndexedTagName( $data, 'specialpage' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
        
        protected function appendMagicWords( $property ) {
@@ -181,7 +181,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $data[] = $arr;
                }
                $this->getResult()->setIndexedTagName($data, 'magicword');
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue('query', $property, $data);
        }
                        
 
@@ -220,7 +220,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $db->freeResult( $res );
 
                $this->getResult()->setIndexedTagName( $data, 'iw' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        protected function appendDbReplLagInfo( $property, $includeAll ) {
@@ -246,8 +246,9 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        );
                }
 
-               $this->getResult()->setIndexedTagName( $data, 'db' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $result = $this->getResult();
+               $result->setIndexedTagName( $data, 'db' );
+               $result->addValue( 'query', $property, $data );
        }
 
        protected function appendStatistics( $property ) {
@@ -261,7 +262,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $data['activeusers'] = intval( SiteStats::activeUsers() );
                $data['admins'] = intval( SiteStats::numberingroup('sysop') );
                $data['jobs'] = intval( SiteStats::jobs() );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        protected function appendUserGroups( $property ) {
@@ -274,7 +275,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                }
 
                $this->getResult()->setIndexedTagName( $data, 'group' );
-               $this->getResult()->addValue( array( 'query', $this->getModuleName() ), $property, $data );
+               $this->getResult()->addValue( 'query', $property, $data );
        }
 
        public function getAllowedParams() {