Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
— | — | @@ -727,9 +727,7 @@ |
728 | 728 | } elseif ( $wgUser->isBlockedFromCreateAccount() ) { |
729 | 729 | $this->userBlockedMessage(); |
730 | 730 | return; |
731 | | - } |
732 | | - // Suppress 'blockedtext' error here, we already checked above. |
733 | | - elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true, array('blockedtext') ) )>0 ) { |
| 731 | + } elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true ) )>0 ) { |
734 | 732 | $wgOut->showPermissionsErrorPage( $permErrors, 'createaccount' ); |
735 | 733 | return; |
736 | 734 | } |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -405,8 +405,6 @@ |
406 | 406 | * (bug 14687) OutputPage::addStyle() now adds type="text/css" like it should. |
407 | 407 | * OpenSearch cleanup; Firefox now sends you to the search page for empty |
408 | 408 | searches instead of the domain root (which may not even be a wiki). |
409 | | -* (bug 14698) Blocks without "block account creation" set no longer block |
410 | | - account creation. |
411 | 409 | * (bug 3481) Pages moved shortly after creation are shown at their new title |
412 | 410 | on Special:Newpages. |
413 | 411 | * (bug 12716) Trying to unprotect a title that isn't protected no longer |