Follows-up r89848 CR: Cleaner solution

diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 86bddfd..ac8aa25 100644 (file)
--- 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