From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 22 Sep 2011 11:04:30 +0000 (+0000)
Subject: Merge r97789 into trunk
X-Git-Tag: 1.31.0-rc.0~27482
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=bd9136167cd985aed666a87d1212da574bcd4cb6;p=lhc%2Fweb%2Fwiklou.git

Merge r97789 into trunk

Follows up r92528 where this was introduced
---

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 4f22f537bb..fb84dece76 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -297,12 +297,12 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 			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;