Follow-up: r89845: Forgot to commit changes in the other directory
authorKrinkle <krinkle@users.mediawiki.org>
Fri, 10 Jun 2011 20:08:19 +0000 (20:08 +0000)
committerKrinkle <krinkle@users.mediawiki.org>
Fri, 10 Jun 2011 20:08:19 +0000 (20:08 +0000)
resources/mediawiki.util/mediawiki.util.js

index f59272e..4eb3224 100644 (file)
                        var block = allowBlock ? '(?:\\/(?:3[0-2]|[12]?\\d))?' : '';
                        var RE_IP_BYTE = '(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])';
                        var RE_IP_ADD = '(?:' + RE_IP_BYTE + '\\.){3}' + RE_IP_BYTE;
-                       return address.search( new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1;
+                       return typeof address === 'string' && address.search( new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1;
                },
                /**
                 * Note: borrows from IP::isIPv6
                 * @return boolean
                 */
                'isIPv6Address' : function( address, allowBlock ) {
+                       if ( typeof address !== 'string' ) {
+                               return false;
+                       }
                        var block = allowBlock ? '(?:\\/(?:12[0-8]|1[01][0-9]|[1-9]?\\d))?' : '';
                        var RE_IPV6_ADD =
                        '(?:' + // starts with "::" (including "::")