http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89268
Revision: 89268
Author: reedy
Date: 2011-06-01 15:38:18 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Manually merge r89266
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialCentralAuth.php
Modified: branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialCentralAuth.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialCentralAuth.php
2011-06-01 15:36:07 UTC (rev 89267)
+++ branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialCentralAuth.php
2011-06-01 15:38:18 UTC (rev 89268)
@@ -363,6 +363,13 @@
function listMergedWikiItem( $row ) {
global $wgLang;
+
+ if ( $row === null ) {
+ // https://bugzilla.wikimedia.org/show_bug.cgi?id=28767
+ // It seems sometimes local accounts aren't correctly
created
+ // Revisiting the wiki solves the issue
+ return '';
+ }
return '<tr>' .
( $this->mCanUnmerge ? '<td>' . $this->adminCheck(
$row['wiki'] ) . '</td>' : '' ) .
'<td>' . $this->foreignUserLink( $row['wiki'] ) .
'</td>' .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
