| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1573,10 +1573,15 @@ |
| 1574 | 1574 | 'attachedMethod' => $row->lu_attached_method, |
| 1575 | 1575 | ); |
| 1576 | 1576 | |
| | 1577 | + $localUser = $this->localUserData( $row->lu_wiki ); |
| | 1578 | + |
| | 1579 | + if ( $localUser === false ) { |
| | 1580 | + continue; |
| | 1581 | + } |
| 1577 | 1582 | // Just for fun, add local user data. |
| 1578 | 1583 | // Displayed in the steward interface. |
| 1579 | 1584 | $wikis[$row->lu_wiki] = array_merge( $wikis[$row->lu_wiki], |
| 1580 | | - $this->localUserData( $row->lu_wiki ) ); |
| | 1585 | + $localUser ); |
| 1581 | 1586 | } |
| 1582 | 1587 | |
| 1583 | 1588 | return $wikis; |
| — | — | @@ -1608,7 +1613,7 @@ |
| 1609 | 1614 | * Fetch a row of user data needed for migration. |
| 1610 | 1615 | * |
| 1611 | 1616 | * @param $wikiID String |
| 1612 | | - * @return Array |
| | 1617 | + * @return Array|bool |
| 1613 | 1618 | */ |
| 1614 | 1619 | protected function localUserData( $wikiID ) { |
| 1615 | 1620 | $lb = wfGetLB( $wikiID ); |