From: <be...@us...> - 2010-10-09 11:55:29
|
Revision: 2368 http://geshi.svn.sourceforge.net/geshi/?rev=2368&view=rev Author: benbe Date: 2010-10-09 11:55:23 +0000 (Sat, 09 Oct 2010) Log Message: ----------- fix: SF#3077256: Minor changes to boundary checks before keywords (allow ; and >, but disallow .asp/.aspx afterwards Modified Paths: -------------- trunk/geshi-1.0.X/src/docs/CHANGES trunk/geshi-1.0.X/src/geshi.php Modified: trunk/geshi-1.0.X/src/docs/CHANGES =================================================================== --- trunk/geshi-1.0.X/src/docs/CHANGES 2010-10-03 13:03:50 UTC (rev 2367) +++ trunk/geshi-1.0.X/src/docs/CHANGES 2010-10-09 11:55:23 UTC (rev 2368) @@ -18,7 +18,8 @@ * EPC (Thorsten Muehlfelder) * Falcon (billykater) - Small bugfix in LangCheck when looking for language files - - Added '-' to list of RX chars that require explicit escaping (BenBE) + - Added '-' to list of RX chars that require explicit escaping (SF#3056454, BenBE) + - Minor changes to boundary checks (SF#3077256, BenBE) - Improvements to language files (BenBE) * Major rework of the ALGOL68 language file (Neville Dempsey) * LangCheck warnings from GO language file (BenBE) @@ -26,8 +27,8 @@ * Properly highlight infinity as numbers for J (Ric Sherlock) * Improved GDB Backtrace language file (Milian Wolff) * Updated Liberty BASIC language file (Chris Iverson) - * Fixed a small issue with detection of division vs. regular expressions - for ActionScript 3 and JavaScript (Kevin Day) + * Fixed a small issue with detection of division vs. regular expressions + for ActionScript 3 and JavaScript (Kevin Day) Version 1.0.8.9 - Added language files * Algol68 (Neville Dempsey) Modified: trunk/geshi-1.0.X/src/geshi.php =================================================================== --- trunk/geshi-1.0.X/src/geshi.php 2010-10-03 13:03:50 UTC (rev 2367) +++ trunk/geshi-1.0.X/src/geshi.php 2010-10-09 11:55:23 UTC (rev 2368) @@ -3339,7 +3339,7 @@ $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse); // Highlight keywords - $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#;>|^&"; + $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#|^&"; $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;"; if ($this->lexic_permissions['STRINGS']) { $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/'); @@ -3397,7 +3397,7 @@ // Basically, we don't put the styles in yet because then the styles themselves will // get highlighted if the language has a CSS keyword in it (like CSS, for example ;)) $stuff_to_parse = preg_replace_callback( - "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php))$disallowed_after_local/$modifiers", + "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php|aspx?))$disallowed_after_local/$modifiers", array($this, 'handle_keyword_replace'), $stuff_to_parse ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |