Merge "[Bug 35738] remove zone info from ipv6 addresses"

diff --git a/includes/IP.php b/includes/IP.php
index 1828249..10c707e 100644 (file)
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -714,6 +714,7 @@ class IP {
         * @return String: valid dotted quad IPv4 address or null
         */
        public static function canonicalize( $addr ) {
+               $addr = preg_replace( '/\%.*/','', $addr ); // remove zone info (bug 35738)
                if ( self::isValid( $addr ) ) {
                        return $addr;
                }