http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76195
Revision: 76195 Author: btongminh Date: 2010-11-06 15:57:15 +0000 (Sat, 06 Nov 2010) Log Message: ----------- Follow up r75621: Use setContent and setIndexedTagName methods Modified Paths: -------------- trunk/phase3/includes/api/ApiRsd.php Modified: trunk/phase3/includes/api/ApiRsd.php =================================================================== --- trunk/phase3/includes/api/ApiRsd.php 2010-11-06 15:14:04 UTC (rev 76194) +++ trunk/phase3/includes/api/ApiRsd.php 2010-11-06 15:57:15 UTC (rev 76195) @@ -45,15 +45,9 @@ $result->addValue( null, 'version', '1.0' ); $result->addValue( null, 'xmlns', 'http://archipelago.phrasewise.com/rsd' ); - $service = array( - 'engineName' => array( - '*' => 'MediaWiki' - ), - 'engineLink' => array( - '*' => 'http://www.mediawiki.org/' - ), - 'apis' => $this->formatRsdApiList() - ); + $service = array( 'apis' => $this->formatRsdApiList() ); + ApiResult::setContent( $service, 'MediaWiki', 'engineName' ); + ApiResult::setContent( $service, 'http://www.mediawiki.org/', 'engineLink' ); $result->setIndexedTagName( $service['apis'], 'api' ); @@ -138,12 +132,11 @@ 'name' => $name, 'preferred' => wfBoolToStr( $name == 'MediaWiki' ), 'apiLink' => $info['apiLink'], - 'blogID' => isset( $info['blogID'] ) ? $info['blogID'] : '' + 'blogID' => isset( $info['blogID'] ) ? $info['blogID'] : '', ); + $settings = array(); if ( isset( $info['docs'] ) ) { - $data['settings']['docs'] = array( - '*' => $info['docs'], - ); + ApiResult::setContent( $settings, $info['docs'], 'docs' ); } if ( isset( $info['settings'] ) ) { foreach ( $info['settings'] as $setting => $val ) { @@ -152,14 +145,14 @@ } else { $xmlVal = $val; } - $data['settings'][] = array( - 'name' => $setting, - '*' => $xmlVal, - ); + $setting = array( 'name' => $setting ); + ApiResult::setContent( $setting, $xmlVal ); + $settings[] = $setting; } } - if ( isset( $data['settings'] ) ) { - $data['settings']['_element'] = 'setting'; + if ( count( $settings ) ) { + $this->getResult()->setIndexedTagName( $settings, 'setting' ); + $data['settings'] = $settings; } $outputData[] = $data; } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs