| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -221,8 +221,7 @@ |
| 222 | 222 | protected function appendSpecialPageAliases( $property ) { |
| 223 | 223 | global $wgContLang; |
| 224 | 224 | $data = array(); |
| 225 | | - foreach ( $wgContLang->getSpecialPageAliases() as $specialpage => $aliases ) |
| 226 | | - { |
| | 225 | + foreach ( $wgContLang->getSpecialPageAliases() as $specialpage => $aliases ) { |
| 227 | 226 | $arr = array( 'realname' => $specialpage, 'aliases' => $aliases ); |
| 228 | 227 | $this->getResult()->setIndexedTagName( $arr['aliases'], 'alias' ); |
| 229 | 228 | $data[] = $arr; |
| — | — | @@ -250,7 +249,7 @@ |
| 251 | 250 | protected function appendInterwikiMap( $property, $filter ) { |
| 252 | 251 | $this->resetQueryParams(); |
| 253 | 252 | $this->addTables( 'interwiki' ); |
| 254 | | - $this->addFields( array( 'iw_prefix', 'iw_local', 'iw_url' ) ); |
| | 253 | + $this->addFields( array( 'iw_prefix', 'iw_local', 'iw_url', 'iw_wikiid', 'iw_api' ) ); |
| 255 | 254 | |
| 256 | 255 | if ( $filter === 'local' ) { |
| 257 | 256 | $this->addWhere( 'iw_local = 1' ); |
| — | — | @@ -277,6 +276,8 @@ |
| 278 | 277 | $val['language'] = $langNames[$row->iw_prefix]; |
| 279 | 278 | } |
| 280 | 279 | $val['url'] = $row->iw_url; |
| | 280 | + $val['wikiid'] = $row->iw_wikiid; |
| | 281 | + $val['api'] = $row->iw_api; |
| 281 | 282 | |
| 282 | 283 | $data[] = $val; |
| 283 | 284 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -345,6 +345,7 @@ |
| 346 | 346 | * (bug 28591) Update/replace/supplement spyc (YAML parsing library) |
| 347 | 347 | * YAML API output is now 1.2 compliant, using JSON as the formatter |
| 348 | 348 | * (bug 28672) give information about misermode on api |
| | 349 | +* (bug 28558) Add iw_api and iw_wikiid to meta=siteinfo&siprop=interwikimap |
| 349 | 350 | |
| 350 | 351 | === Languages updated in 1.18 === |
| 351 | 352 | |