* Fix regression in blocking of user accounts

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c65edd2..8f50cf9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -54,6 +54,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6592) Add most viewed pages summary to Special:Statistics
 * Pre-strip characters ignored in IDNs from URLs so they can't be used
   to break the blacklists for regular URLs
+* Fix regression in blocking of user accounts
 
 
 == Languages updated ==

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 943d1d0..de242d1 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -193,6 +193,7 @@ class IPBlockForm {
                                        if( !is_null( $user ) && $user->getID() ) {
                                                # Use canonical name
                                                $this->BlockAddress = $user->getName();
+                                               $userId = $user->getID();
                                        } else {
                                                $this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) );
                                                return;