Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -407,6 +407,8 @@ |
408 | 408 | * (bug 14687) OutputPage::addStyle() now adds type="text/css" like it should. |
409 | 409 | * OpenSearch cleanup; Firefox now sends you to the search page for empty |
410 | 410 | searches instead of the domain root (which may not even be a wiki). |
| 411 | +* (bug 14698) Blocks without "block account creation" set no longer block |
| 412 | + account creation. |
411 | 413 | |
412 | 414 | |
413 | 415 | === API changes in 1.13 === |
Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
— | — | @@ -727,7 +727,9 @@ |
728 | 728 | } elseif ( $wgUser->isBlockedFromCreateAccount() ) { |
729 | 729 | $this->userBlockedMessage(); |
730 | 730 | return; |
731 | | - } elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true ) )>0 ) { |
| 731 | + } |
| 732 | + // Supress 'blockedtext' error here, we already checked above. |
| 733 | + elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true, array('blockedtext') ) )>0 ) { |
732 | 734 | $wgOut->showPermissionsErrorPage( $permErrors, 'createaccount' ); |
733 | 735 | return; |
734 | 736 | } |