* (bug 22666) Submitting user block form with an invalid user name no longer throws...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d9bb77e..45171de 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,7 +21,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === Configuration changes in 1.17 ===
 
 === Bug fixes in 1.17 ===
-* (bug 17560) Half-broken deletion moved image files to deletion archive without updating DB
+* (bug 17560) Half-broken deletion moved image files to deletion archive without
+  updating DB
+* (bug 22666) Submitting user block form with an invalid user name no longer
+  throws an error
 
 == API changes in 1.17 ==
 

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 16720dd..1e56fa6 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -410,7 +410,7 @@ class IPBlockForm {
                                # Username block
                                if( $wgSysopUserBans ) {
                                        $user = User::newFromName( $this->BlockAddress );
-                                       if( !is_null( $user ) && $user->getId() ) {
+                                       if( $user !== false && $user->getId() ) {
                                                # Use canonical name
                                                $userId = $user->getId();
                                                $this->BlockAddress = $user->getName();