From: <be...@us...> - 2009-06-28 23:21:19
|
Revision: 2135 http://geshi.svn.sourceforge.net/geshi/?rev=2135&view=rev Author: benbe Date: 2009-06-28 23:21:16 +0000 (Sun, 28 Jun 2009) Log Message: ----------- fix: Improved Robustness of Documentation URL linking Modified Paths: -------------- trunk/geshi-1.0.X/src/geshi.php Modified: trunk/geshi-1.0.X/src/geshi.php =================================================================== --- trunk/geshi-1.0.X/src/geshi.php 2009-06-28 23:17:44 UTC (rev 2134) +++ trunk/geshi-1.0.X/src/geshi.php 2009-06-28 23:21:16 UTC (rev 2135) @@ -2013,7 +2013,7 @@ } $this->language_data['NUMBERS_RXCACHE'][$key] = - "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!\|>)(?![^\"\|\>\<]+<)/i"; + "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?![^<]+?>)(?!\|>)(?![^\"\|\>\<]+<)/i"; } } @@ -3431,7 +3431,7 @@ //FIX for symbol highlighting ... if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) { //Get all matches and throw away those witin a block that is already highlighted... (i.e. matched by a regexp) - $n_symbols = preg_match_all("/<\|(?:<DOT>|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); + $n_symbols = preg_match_all("/<\|(?:<DOT>|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+(?![^<]+?>)/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); $global_offset = 0; for ($s_id = 0; $s_id < $n_symbols; ++$s_id) { $symbol_match = $pot_symbols[$s_id][0][0]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |