Revert r36916 for now ("(bug 14698) Make "Block account creation" work as advertised...

This doesn't appear to be working the right way; it's finding that permission is not allowed, but then trying to ignore particular reasons why it might not be allowed.
Correct fix should be to ensure that the correct result is actually obtained from the permission check in the first place!
Note that the error key may have 'autoblocktext' for autoblocks, which would not match this check as written.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 057193b..79ff01a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -405,8 +405,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14687) OutputPage::addStyle() now adds type="text/css" like it should.
 * OpenSearch cleanup; Firefox now sends you to the search page for empty
   searches instead of the domain root (which may not even be a wiki).
-* (bug 14698) Blocks without "block account creation" set no longer block
-  account creation.
 * (bug 3481) Pages moved shortly after creation are shown at their new title
   on Special:Newpages.
 * (bug 12716) Trying to unprotect a title that isn't protected no longer 

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index a3892e8..179ef3f 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -727,9 +727,7 @@ class LoginForm {
                        } elseif ( $wgUser->isBlockedFromCreateAccount() ) {
                                $this->userBlockedMessage();
                                return;
-                       }
-                       // Suppress 'blockedtext' error here, we already checked above.
-                        elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true, array('blockedtext') ) )>0 ) {
+                       } elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true ) )>0 ) {
                                $wgOut->showPermissionsErrorPage( $permErrors, 'createaccount' );
                                return;
                        }