http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89848
Revision: 89848
Author: krinkle
Date: 2011-06-10 20:08:19 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Follow-up: r89845: Forgot to commit changes in the other directory
Modified Paths:
--------------
trunk/phase3/resources/mediawiki.util/mediawiki.util.js
Modified: trunk/phase3/resources/mediawiki.util/mediawiki.util.js
===================================================================
--- trunk/phase3/resources/mediawiki.util/mediawiki.util.js 2011-06-10
20:04:17 UTC (rev 89847)
+++ trunk/phase3/resources/mediawiki.util/mediawiki.util.js 2011-06-10
20:08:19 UTC (rev 89848)
@@ -560,7 +560,7 @@
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
@@ -570,6 +570,9 @@
* @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 "::")
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
