From: Peter T. <pt...@nt...> - 2005-02-04 08:02:02
|
Author: pthoeny Date: 2005-02-04 00:00:07 -0800 (Fri, 04 Feb 2005) New Revision: 3592 Modified: twiki/branches/DEVELOP/lib/TWiki/Render.pm Log: FormattedSearchSummaryWithExpandVar: Fix for Web.WikiWord link not getting escaped Modified: twiki/branches/DEVELOP/lib/TWiki/Render.pm =================================================================== --- twiki/branches/DEVELOP/lib/TWiki/Render.pm 2005-02-04 07:21:16 UTC (rev 3591) +++ twiki/branches/DEVELOP/lib/TWiki/Render.pm 2005-02-04 08:00:07 UTC (rev 3592) @@ -1163,7 +1163,7 @@ # prevent text from getting rendered in inline search and link tool # tip text by escaping links (external, internal, Interwiki) - $text =~ s/([\s\(])($TWiki::regex{wikiWordRegex}|$TWiki::regex{abbrevRegex})/$1<nop>$2/g; + $text =~ s/([\s\(])((($TWiki::regex{webNameRegex})\.)?($TWiki::regex{wikiWordRegex}|$TWiki::regex{abbrevRegex}))/$1<nop>$2/g; $text =~ s/([\-\*\s])($TWiki::regex{linkProtocolPattern}\:)/$1<nop>$2/go; $text =~ s/@([a-zA-Z0-9\-\_\.]+)/@<nop>$1/g; # email address |