r97806 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97805‎ | r97806 | r97807 >
Date:11:04, 22 September 2011
Author:reedy
Status:ok
Tags:
Comment:
Merge r97789 into trunk

Follows up r92528 where this was introduced
Modified paths:
  • /trunk/phase3/includes/api (modified) (history)
  • /trunk/phase3/includes/api/ApiQuerySiteinfo.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php
@@ -297,12 +297,12 @@
298298 if ( isset( $langNames[$prefix] ) ) {
299299 $val['language'] = $langNames[$prefix];
300300 }
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;
304304 }
305 - if( isset( $row['iw_api'] ) ) {
306 - $val['api'] = $row['iw_api'];
 305+ if( isset( $row->iw_api ) ) {
 306+ $val['api'] = $row->iw_api;
307307 }
308308
309309 $data[] = $val;
Property changes on: trunk/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
310310 Merged /branches/wmf/1.18wmf1/includes/api:r97789

Follow-up revisions

RevisionCommit summaryAuthorDate
r98762REL1_18 MFT r97806, r97895, r98193, r98194, r98237, r98502, r98656, r98707, r...reedy13:56, 3 October 2011
r104573The URL wasn't loading when the database is used (interwiki cache works). "PH...robin16:48, 29 November 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92528(bug 19838) API does not use interwiki cache....robin12:30, 19 July 2011
r97789Fixed accessing of $row var. Was giving:...aaron03:59, 22 September 2011

Status & tagging log