https://www.mediawiki.org/wiki/Special:Code/MediaWiki/104573
Revision: 104573
Author: robin
Date: 2011-11-29 16:48:37 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
The URL wasn't loading when the database is used (interwiki cache works). "PHP
Notice: Trying to get property of non-object in
/www/w/includes/api/ApiQuerySiteinfo.php on line 295"
This reverts r97806. It took me some time to find out, but r96475 accidentally
backported the change from $row->iw_url to $row['iw_url'] (etc) to 1.18, which
was fixed in r97789. That revision was merged to trunk, which shouldn't have
been done either. I.e. until 1.18 it is an object, from 1.19 it is an array.
Modified Paths:
--------------
trunk/phase3/includes/api/ApiQuerySiteinfo.php
Modified: trunk/phase3/includes/api/ApiQuerySiteinfo.php
===================================================================
--- trunk/phase3/includes/api/ApiQuerySiteinfo.php 2011-11-29 16:28:55 UTC
(rev 104572)
+++ trunk/phase3/includes/api/ApiQuerySiteinfo.php 2011-11-29 16:48:37 UTC
(rev 104573)
@@ -292,12 +292,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
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
