Merge r97789 into trunk

Follows up r92528 where this was introduced

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 4f22f53..fb84dec 100644 (file)
--- 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;