http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97806
Revision: 97806
Author: reedy
Date: 2011-09-22 11:04:30 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Merge r97789 into trunk
Follows up r92528 where this was introduced
Modified Paths:
--------------
trunk/phase3/includes/api/ApiQuerySiteinfo.php
Property Changed:
----------------
trunk/phase3/includes/api/
Property changes on: trunk/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf/1.18wmf1/includes/api:97789
/branches/wmf-deployment/includes/api:53381,59952
Modified: trunk/phase3/includes/api/ApiQuerySiteinfo.php
===================================================================
--- trunk/phase3/includes/api/ApiQuerySiteinfo.php 2011-09-22 09:31:46 UTC
(rev 97805)
+++ trunk/phase3/includes/api/ApiQuerySiteinfo.php 2011-09-22 11:04:30 UTC
(rev 97806)
@@ -297,12 +297,12 @@
if ( isset( $langNames[$prefix] ) ) {
$val['language'] = $langNames[$prefix];
}
- $val['url'] = wfExpandUrl( $row['iw_url'],
PROTO_CURRENT );
- if( isset( $row['iw_wikiid'] ) ) {
- $val['wikiid'] = $row['iw_wikiid'];
+ $val['url'] = wfExpandUrl( $row->iw_url, PROTO_CURRENT
);
+ if( isset( $row->iw_wikiid ) ) {
+ $val['wikiid'] = $row->iw_wikiid;
}
- if( isset( $row['iw_api'] ) ) {
- $val['api'] = $row['iw_api'];
+ if( isset( $row->iw_api ) ) {
+ $val['api'] = $row->iw_api;
}
$data[] = $val;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
