| Index: trunk/extensions/CentralAuth/SpecialMergeAccount.php |
| — | — | @@ -256,6 +256,10 @@ |
| 257 | 257 | throw new MWException( "User doesn't exist -- race condition?" ); |
| 258 | 258 | } |
| 259 | 259 | |
| | 260 | + if( !$globalUser->isAttached() ) { |
| | 261 | + throw new MWException( "Can't cleanup merge if not already attached." ); |
| | 262 | + } |
| | 263 | + |
| 260 | 264 | if( $wgCentralAuthDryRun ) { |
| 261 | 265 | return $this->dryRunError(); |
| 262 | 266 | } |
| — | — | @@ -288,6 +292,10 @@ |
| 289 | 293 | throw new MWException( "User doesn't exist -- race condition?" ); |
| 290 | 294 | } |
| 291 | 295 | |
| | 296 | + if( $globalUser->isAttached() ) { |
| | 297 | + throw new MWException( "Already attached -- race condition?" ); |
| | 298 | + } |
| | 299 | + |
| 292 | 300 | if( $wgCentralAuthDryRun ) { |
| 293 | 301 | return $this->dryRunError(); |
| 294 | 302 | } |