| Index: trunk/phase3/includes/SpecialUserlogin.php |
| — | — | @@ -228,10 +228,13 @@ |
| 229 | 229 | return false; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | | - # Check anonymous user ($wgUser) limitations : |
| 233 | | - if (!$wgUser->isAllowedToCreateAccount()) { |
| | 232 | + # Check permissions |
| | 233 | + if ( !$wgUser->isAllowed( 'createaccount' ) ) { |
| 234 | 234 | $this->userNotPrivilegedMessage(); |
| 235 | 235 | return false; |
| | 236 | + } elseif ( $wgUser->isBlockedFromCreateAccount() ) { |
| | 237 | + $this->userBlockedMessage(); |
| | 238 | + return false; |
| 236 | 239 | } |
| 237 | 240 | |
| 238 | 241 | $ip = wfGetIP(); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -70,6 +70,7 @@ |
| 71 | 71 | * (bug 8376) Special:Newpages accepts namespace in subpage form |
| 72 | 72 | * Make input form of Special:Newpages nicer for RTL wikis |
| 73 | 73 | * Fix namespace selection after submit of Special:Newpages |
| | 74 | +* Show the right message on account creation when the user is blocked |
| 74 | 75 | |
| 75 | 76 | === API changes in 1.12 === |
| 76 | 77 | |