From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 11 Jul 2006 20:31:06 +0000 (+0000)
Subject: * Fix regression in blocking of user accounts
X-Git-Tag: 1.31.0-rc.0~56285
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=41efbbbe0245720702271c811c19ebb462affc50;p=lhc%2Fweb%2Fwiklou.git

* Fix regression in blocking of user accounts
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c65edd2368..8f50cf9b01 100644
--- 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 943d1d0a13..de242d1e7e 100644
--- 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;