| Index: branches/wmf/1.18wmf1/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1512,10 +1512,15 @@ |
| 1513 | 1513 | 'attachedMethod' => $row->lu_attached_method, |
| 1514 | 1514 | ); |
| 1515 | 1515 | |
| | 1516 | + $localUser = $this->localUserData( $row->lu_wiki ); |
| | 1517 | + |
| | 1518 | + if ( $localUser === false ) { |
| | 1519 | + continue; |
| | 1520 | + } |
| 1516 | 1521 | // Just for fun, add local user data. |
| 1517 | 1522 | // Displayed in the steward interface. |
| 1518 | 1523 | $wikis[$row->lu_wiki] = array_merge( $wikis[$row->lu_wiki], |
| 1519 | | - $this->localUserData( $row->lu_wiki ) ); |
| | 1524 | + $localUser ); |
| 1520 | 1525 | } |
| 1521 | 1526 | |
| 1522 | 1527 | return $wikis; |
| — | — | @@ -1545,6 +1550,9 @@ |
| 1546 | 1551 | |
| 1547 | 1552 | /** |
| 1548 | 1553 | * Fetch a row of user data needed for migration. |
| | 1554 | + * |
| | 1555 | + * @param $wikiID String |
| | 1556 | + * @return Array|bool |
| 1549 | 1557 | */ |
| 1550 | 1558 | protected function localUserData( $wikiID ) { |
| 1551 | 1559 | $lb = wfGetLB( $wikiID ); |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1552 | 1560 | Merged /trunk/extensions:r103669 |