* (bug 33101) Viewing a User or User talk of username resembling IP ending with...

Patch by Brad Jorsch

Also simplify double return null in method

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 0f663dc..e34014b 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -183,6 +183,8 @@ production.
 * (bug 32960) Remove EmailAuthenticationTimestamp from database when a
   email address is removed.
 * (bug 32414) Empty page get a empty bytes attribute in Export/Dump.
+* (bug 33101) Viewing a User or User talk of username resembling IP ending
+  with .xxx causes Internal error
 
 === API changes in 1.19 ===
 * (bug 19838) siprop=interwikimap can now use the interwiki cache.

diff --git a/includes/Block.php b/includes/Block.php
index 9cdb9d2..ded9cf9 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -430,7 +430,7 @@ class Block {
 
                $row = $this->getDatabaseArray();
                $row['ipb_id'] = $dbw->nextSequenceValue("ipblocks_ipb_id_seq");
-               
+
                $dbw->insert(
                        'ipblocks',
                        $row,
@@ -969,7 +969,7 @@ class Block {
         */
        public static function formatExpiry( $encoded_expiry ) {
                wfDeprecated( __METHOD__, '1.18' );
-               
+
                global $wgContLang;
                static $msg = null;
 
@@ -1039,7 +1039,7 @@ class Block {
                        # passed by some callers (bug 29116)
                        return null;
 
-               } elseif( in_array( $type, array( Block::TYPE_USER, Block::TYPE_IP, Block::TYPE_RANGE, null ) ) ) {
+               } elseif( in_array( $type, array( Block::TYPE_USER, Block::TYPE_IP, Block::TYPE_RANGE ) ) ) {
                        $block = new Block();
                        $block->fromMaster( $fromMaster );
 
@@ -1049,12 +1049,9 @@ class Block {
 
                        if( $block->newLoad( $vagueTarget ) ){
                                return $block;
-                       } else {
-                               return null;
                        }
-               } else {
-                       return null;
                }
+               return null;
        }
 
        /**