| Index: trunk/phase3/includes/SpecialUserlogin.php |
| — | — | @@ -228,7 +228,7 @@ |
| 229 | 229 | return false; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | | - # Check anonymous user ($wgUser) limitations : |
| | 232 | + #Â Check anonymous user ($wgUser) limitations : |
| 233 | 233 | if (!$wgUser->isAllowedToCreateAccount()) { |
| 234 | 234 | $this->userNotPrivilegedMessage(); |
| 235 | 235 | return false; |
| — | — | @@ -596,7 +596,7 @@ |
| 597 | 597 | |
| 598 | 598 | /** */ |
| 599 | 599 | function userBlockedMessage() { |
| 600 | | - global $wgOut; |
| | 600 | + global $wgOut, $wgUser; |
| 601 | 601 | |
| 602 | 602 | # Let's be nice about this, it's likely that this feature will be used |
| 603 | 603 | # for blocking large numbers of innocent people, e.g. range blocks on |
| — | — | @@ -611,7 +611,10 @@ |
| 612 | 612 | $wgOut->setArticleRelated( false ); |
| 613 | 613 | |
| 614 | 614 | $ip = wfGetIP(); |
| 615 | | - $wgOut->addWikiText( wfMsg( 'cantcreateaccounttext', $ip ) ); |
| | 615 | + $blocker = User::whoIs($wgUser->mBlock->mBy); |
| | 616 | + $block_reason = $wgUser->mBlock->mReason; |
| | 617 | + |
| | 618 | + $wgOut->addWikiText( wfMsg( 'cantcreateaccounttext', $ip, $block_reason, $blocker ) ); |
| 616 | 619 | $wgOut->returnToMain( false ); |
| 617 | 620 | } |
| 618 | 621 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -36,6 +36,8 @@ |
| 37 | 37 | translations |
| 38 | 38 | * (bug 11211) Pass, as a parameter to the protectedpagetext interface |
| 39 | 39 | message, the level of protection. |
| | 40 | +* (bug 9611) Supply the blocker and reason for the cantcreateaccounttext |
| | 41 | + message. |
| 40 | 42 | |
| 41 | 43 | === API changes in 1.12 === |
| 42 | 44 | |