Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
— | — | @@ -297,12 +297,12 @@ |
298 | 298 | if ( isset( $langNames[$prefix] ) ) { |
299 | 299 | $val['language'] = $langNames[$prefix]; |
300 | 300 | } |
301 | | - $val['url'] = wfExpandUrl( $row['iw_url'], PROTO_CURRENT ); |
302 | | - if( isset( $row['iw_wikiid'] ) ) { |
303 | | - $val['wikiid'] = $row['iw_wikiid']; |
| 301 | + $val['url'] = wfExpandUrl( $row->iw_url, PROTO_CURRENT ); |
| 302 | + if( isset( $row->iw_wikiid ) ) { |
| 303 | + $val['wikiid'] = $row->iw_wikiid; |
304 | 304 | } |
305 | | - if( isset( $row['iw_api'] ) ) { |
306 | | - $val['api'] = $row['iw_api']; |
| 305 | + if( isset( $row->iw_api ) ) { |
| 306 | + $val['api'] = $row->iw_api; |
307 | 307 | } |
308 | 308 | |
309 | 309 | $data[] = $val; |
Property changes on: trunk/phase3/includes/api |
___________________________________________________________________ |
Modified: svn:mergeinfo |
310 | 310 | Merged /branches/wmf/1.18wmf1/includes/api:r97789 |