From: Krinkle <krinkle@users.mediawiki.org>
Date: Wed, 3 Aug 2011 07:45:54 +0000 (+0000)
Subject: Follows-up r89848 CR: Cleaner solution
X-Git-Tag: 1.31.0-rc.0~28467
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=16f002e139995ea890a14cdee0035d6343a63ef7;p=lhc%2Fweb%2Fwiklou.git

Follows-up r89848 CR: Cleaner solution
---

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