| Property changes on: branches/wmf/1.16wmf4/extensions/CentralAuth/CentralAuthUser.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/wmf-deployment/extensions/CentralAuth/CentralAuthUser.php:60970 |
| /trunk/extensions/CentralAuth/CentralAuthUser.php:62827,64771,64982 |
| 2 | 2 | + /branches/wmf-deployment/extensions/CentralAuth/CentralAuthUser.php:60970 |
| /trunk/extensions/CentralAuth/CentralAuthUser.php:62827,64771,64982,65045 |
| Index: branches/wmf/1.16wmf4/extensions/CentralAuth/SpecialCentralAuth.php |
| — | — | @@ -586,8 +586,8 @@ |
| 587 | 587 | } |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | | - // Should not happen. |
| 591 | | - throw new MWException( 'Failed to determine home wiki' ); |
| | 590 | + // Home account can be renamed or unmerged |
| | 591 | + return wfMsgHtml( 'centralauth-admin-nohome' ); |
| 592 | 592 | } |
| 593 | 593 | |
| 594 | 594 | function evaluateTotalEditcount() { |
| Index: branches/wmf/1.16wmf4/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -146,6 +146,7 @@ |
| 147 | 147 | 'centralauth-admin-info-editcount' => 'Total editcount:', |
| 148 | 148 | 'centralauth-admin-info-locked' => 'Locked:', |
| 149 | 149 | 'centralauth-admin-info-hidden' => 'Hidden level:', |
| | 150 | + 'centralauth-admin-nohome' => 'unable to determine', |
| 150 | 151 | 'centralauth-admin-yes' => 'yes', |
| 151 | 152 | 'centralauth-admin-no' => 'no', |
| 152 | 153 | 'centralauth-admin-hidden-list' => 'from public lists', |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralAuth |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 153 | 154 | - /branches/wmf-deployment/extensions/CentralAuth:60970 |
| /trunk/extensions/CentralAuth:62827,64771 |
| 154 | 155 | + /branches/wmf-deployment/extensions/CentralAuth:60970 |
| /trunk/extensions/CentralAuth:62827,64771,65045 |