| Index: trunk/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -276,21 +276,18 @@ |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
| 280 | | - * Don't allow an attached local account to be renamed with the old system. |
| | 280 | + * Warn bureaucrat about possible conflicts with unified accounts |
| 281 | 281 | */ |
| 282 | 282 | static function onRenameUserWarning( $oldName, $newName, &$warnings ) { |
| 283 | 283 | $oldCentral = new CentralAuthUser( $oldName ); |
| 284 | 284 | if ( $oldCentral->exists() && $oldCentral->isAttached() ) { |
| 285 | | - global $wgOut; |
| 286 | 285 | wfLoadExtensionMessages('SpecialCentralAuth'); |
| 287 | | - $warnings[] = array( 'centralauth-renameuser-abort', $oldName, $newName ); |
| 288 | | - return false; |
| | 286 | + $warnings[] = array( 'centralauth-renameuser-merged', $oldName, $newName ); |
| 289 | 287 | } |
| 290 | 288 | $newCentral = new CentralAuthUser( $newName ); |
| 291 | 289 | if ( $newCentral->exists() && !$newCentral->isAttached() ) { |
| 292 | | - global $wgOut; |
| 293 | 290 | wfLoadExtensionMessages('SpecialCentralAuth'); |
| 294 | | - $warnings[] = array( 'centralauth-renameuser-exists', $oldName, $newName ); |
| | 291 | + $warnings[] = array( 'centralauth-renameuser-reserved', $oldName, $newName ); |
| 295 | 292 | } |
| 296 | 293 | return true; |
| 297 | 294 | } |
| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -209,8 +209,8 @@ |
| 210 | 210 | 'centralauth-prefs-manage' => 'Manage your global account', |
| 211 | 211 | |
| 212 | 212 | // Interaction with Special:Renameuser |
| 213 | | - 'centralauth-renameuser-abort' => "User $1 has been migrated to the unified login system. Renaming it will cause local user detached from the global one.", |
| 214 | | - 'centralauth-renameuser-exists' => "User $2 is reserved for a global account.", |
| | 213 | + 'centralauth-renameuser-merged' => "User $1 has been migrated to the unified login system. Renaming it will cause local user detached from the global one.", |
| | 214 | + 'centralauth-renameuser-reserved' => "User $2 is reserved for a global account.", |
| 215 | 215 | |
| 216 | 216 | // Other messages |
| 217 | 217 | 'centralauth-invalid-wiki' => 'No such wiki database: $1', |