From 16f002e139995ea890a14cdee0035d6343a63ef7 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Wed, 3 Aug 2011 07:45:54 +0000 Subject: [PATCH] Follows-up r89848 CR: Cleaner solution --- resources/mediawiki/mediawiki.util.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js index 86bddfd836..ac8aa25c72 100644 --- a/resources/mediawiki/mediawiki.util.js +++ b/resources/mediawiki/mediawiki.util.js @@ -555,10 +555,13 @@ * @return boolean */ 'isIPv4Address' : function( address, allowBlock ) { + if ( typeof address !== 'string' ) { + return false; + } 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 typeof address === 'string' && address.search( new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1; + return address.search( new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1; }, /** * Note: borrows from IP::isIPv6 -- 2.20.1