https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114192
Revision: 114192 Author: reedy Date: 2012-03-19 21:40:39 +0000 (Mon, 19 Mar 2012) Log Message: ----------- More occurrence typos Modified Paths: -------------- trunk/phase3/includes/parser/Parser.php trunk/phase3/resources/jquery/jquery.highlightText.js trunk/phase3/tests/phpunit/includes/IPTest.php Modified: trunk/phase3/includes/parser/Parser.php =================================================================== --- trunk/phase3/includes/parser/Parser.php 2012-03-19 21:37:02 UTC (rev 114191) +++ trunk/phase3/includes/parser/Parser.php 2012-03-19 21:40:39 UTC (rev 114192) @@ -1700,7 +1700,7 @@ $holders = new LinkHolderArray( $this ); - # split the entire text string on occurences of [[ + # split the entire text string on occurrences of [[ $a = StringUtils::explode( '[[', ' ' . $s ); # get the first element (all text up to first [[), and remove the space we added $s = $a->current(); @@ -2384,7 +2384,7 @@ } /** - * Split up a string on ':', ignoring any occurences inside tags + * Split up a string on ':', ignoring any occurrences inside tags * to prevent illegal overlapping. * * @param $str String the string to split Modified: trunk/phase3/resources/jquery/jquery.highlightText.js =================================================================== --- trunk/phase3/resources/jquery/jquery.highlightText.js 2012-03-19 21:37:02 UTC (rev 114191) +++ trunk/phase3/resources/jquery/jquery.highlightText.js 2012-03-19 21:40:39 UTC (rev 114192) @@ -23,7 +23,7 @@ // TODO - need to be smarter about the character matching here. // non latin characters can make regex think a new word has begun: do not use \b // http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js - // look for an occurence of our pattern and store the starting position + // look for an occurrence of our pattern and store the starting position var match = node.data.match( new RegExp( "(^|\\s)" + $.escapeRE( pat ), "i" ) ); if ( match ) { var pos = match.index + match[1].length; // include length of any matched spaces Modified: trunk/phase3/tests/phpunit/includes/IPTest.php =================================================================== --- trunk/phase3/tests/phpunit/includes/IPTest.php 2012-03-19 21:37:02 UTC (rev 114191) +++ trunk/phase3/tests/phpunit/includes/IPTest.php 2012-03-19 21:40:39 UTC (rev 114192) @@ -14,9 +14,9 @@ $this->assertFalse( IP::isIPAddress( "" ), 'Empty string is not an IP' ); $this->assertFalse( IP::isIPAddress( 'abc' ), 'Garbage IP string' ); $this->assertFalse( IP::isIPAddress( ':' ), 'Single ":" is not an IP' ); - $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::1'), 'IPv6 with a double :: occurence' ); - $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::'), 'IPv6 with a double :: occurence, last at end' ); - $this->assertFalse( IP::isIPAddress( '::2001:0DB8::5:1'), 'IPv6 with a double :: occurence, firt at beginning' ); + $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::1'), 'IPv6 with a double :: occurrence' ); + $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::'), 'IPv6 with a double :: occurrence, last at end' ); + $this->assertFalse( IP::isIPAddress( '::2001:0DB8::5:1'), 'IPv6 with a double :: occurrence, firt at beginning' ); $this->assertFalse( IP::isIPAddress( '124.24.52' ), 'IPv4 not enough quads' ); $this->assertFalse( IP::isIPAddress( '24.324.52.13' ), 'IPv4 out of range' ); $this->assertFalse( IP::isIPAddress( '.24.52.13' ), 'IPv4 starts with period' ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs