*Automatic address expansion, remove redundant check

diff --git a/includes/Block.php b/includes/Block.php
index 00befac..4d7325e 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -26,6 +26,8 @@ class Block
                $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0 )
        {
                $this->mId = 0;
+               # Expand valid IPv6 addresses
+               $address = IP::expandIP( $address );
                $this->mAddress = $address;
                $this->mUser = $user;
                $this->mBy = $by;

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 13cb0b1..41a0f5d 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -199,11 +199,9 @@ class IPBlockForm {
 
                $userId = 0;
                $this->BlockAddress = trim( $this->BlockAddress );
-               # Expand valid IPv6 addresses
-               if ( IP::isIPAddress( $this->BlockAddress ) ) {
-                       $this->BlockAddress = IP::expandIP( $this->BlockAddress );
-               }
-               # The above validation is good enough that those below will suffice from here
+               # Expand valid IPv6 addresses, usernames are left as is
+               $this->BlockAddress = IP::expandIP( $this->BlockAddress );
+               # isIPv4() and IPv6() are used for final validation
                $rxIP4 = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}';
                $rxIP6 = '\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}';
                $rxIP = "($rxIP4|$rxIP6)";