| Index: trunk/phase3/tests/phpunit/includes/IPTest.php |
| — | — | @@ -14,9 +14,9 @@ |
| 15 | 15 | $this->assertFalse( IP::isIPAddress( "" ), 'Empty string is not an IP' ); |
| 16 | 16 | $this->assertFalse( IP::isIPAddress( 'abc' ), 'Garbage IP string' ); |
| 17 | 17 | $this->assertFalse( IP::isIPAddress( ':' ), 'Single ":" is not an IP' ); |
| 18 | | - $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::1'), 'IPv6 with a double :: occurence' ); |
| 19 | | - $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::'), 'IPv6 with a double :: occurence, last at end' ); |
| 20 | | - $this->assertFalse( IP::isIPAddress( '::2001:0DB8::5:1'), 'IPv6 with a double :: occurence, firt at beginning' ); |
| | 18 | + $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::1'), 'IPv6 with a double :: occurrence' ); |
| | 19 | + $this->assertFalse( IP::isIPAddress( '2001:0DB8::A:1::'), 'IPv6 with a double :: occurrence, last at end' ); |
| | 20 | + $this->assertFalse( IP::isIPAddress( '::2001:0DB8::5:1'), 'IPv6 with a double :: occurrence, firt at beginning' ); |
| 21 | 21 | $this->assertFalse( IP::isIPAddress( '124.24.52' ), 'IPv4 not enough quads' ); |
| 22 | 22 | $this->assertFalse( IP::isIPAddress( '24.324.52.13' ), 'IPv4 out of range' ); |
| 23 | 23 | $this->assertFalse( IP::isIPAddress( '.24.52.13' ), 'IPv4 starts with period' ); |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -1700,7 +1700,7 @@ |
| 1701 | 1701 | |
| 1702 | 1702 | $holders = new LinkHolderArray( $this ); |
| 1703 | 1703 | |
| 1704 | | - # split the entire text string on occurences of [[ |
| | 1704 | + # split the entire text string on occurrences of [[ |
| 1705 | 1705 | $a = StringUtils::explode( '[[', ' ' . $s ); |
| 1706 | 1706 | # get the first element (all text up to first [[), and remove the space we added |
| 1707 | 1707 | $s = $a->current(); |
| — | — | @@ -2384,7 +2384,7 @@ |
| 2385 | 2385 | } |
| 2386 | 2386 | |
| 2387 | 2387 | /** |
| 2388 | | - * Split up a string on ':', ignoring any occurences inside tags |
| | 2388 | + * Split up a string on ':', ignoring any occurrences inside tags |
| 2389 | 2389 | * to prevent illegal overlapping. |
| 2390 | 2390 | * |
| 2391 | 2391 | * @param $str String the string to split |
| Index: trunk/phase3/resources/jquery/jquery.highlightText.js |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | // TODO - need to be smarter about the character matching here. |
| 25 | 25 | // non latin characters can make regex think a new word has begun: do not use \b |
| 26 | 26 | // http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js |
| 27 | | - // look for an occurence of our pattern and store the starting position |
| | 27 | + // look for an occurrence of our pattern and store the starting position |
| 28 | 28 | var match = node.data.match( new RegExp( "(^|\\s)" + $.escapeRE( pat ), "i" ) ); |
| 29 | 29 | if ( match ) { |
| 30 | 30 | var pos = match.index + match[1].length; // include length of any matched spaces |