| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -448,6 +448,10 @@ |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | $migrationSet = $this->queryUnattached(); |
| | 452 | + if( empty( $migrationSet ) ) { |
| | 453 | + wfDebugLog( 'CentralAuth', 'dry run: no accounts to merge, failed migration' ); |
| | 454 | + return false; |
| | 455 | + } |
| 452 | 456 | $home = $this->chooseHomeWiki( $migrationSet ); |
| 453 | 457 | $local = $migrationSet[$home]; |
| 454 | 458 | |
| — | — | @@ -483,6 +487,10 @@ |
| 484 | 488 | */ |
| 485 | 489 | private function attemptAutoMigration( $passwords=array() ) { |
| 486 | 490 | $migrationSet = $this->queryUnattached(); |
| | 491 | + if( empty( $migrationSet ) ) { |
| | 492 | + wfDebugLog( 'CentralAuth', 'no accounts to merge, failed migration' ); |
| | 493 | + return false; |
| | 494 | + } |
| 487 | 495 | |
| 488 | 496 | |
| 489 | 497 | $this->mHomeWiki = $this->chooseHomeWiki( $migrationSet ); |