From: <de...@de...> - 2009-03-28 05:55:52
|
Author: PeterThoeny Date: 2009-03-28 00:55:37 -0500 (Sat, 28 Mar 2009) New Revision: 17913 Trac url: http://develop.twiki.org/trac/changeset/17913 Modified: twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm Log: Item6165: Cosmetic comment changes Modified: twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm =================================================================== --- twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm 2009-03-28 05:48:25 UTC (rev 17912) +++ twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm 2009-03-28 05:55:37 UTC (rev 17913) @@ -1169,9 +1169,6 @@ $text =~ s/${STARTWW}\_(\S+?|\S[^\n]*?\S)\_$ENDWW/<em>$1<\/em>/gm; $text =~ s/${STARTWW}\=(\S+?|\S[^\n]*?\S)\=$ENDWW/_fixedFontText($1,0)/gem; - # Mailto - # Email addresses must always be 7-bit, even within I18N sites - # Fix for Item6165: Moved mailto rendering to below [[][]] rendering (broken link if link text has e-mail address) # Handle [[][] and [[]] links @@ -1181,6 +1178,7 @@ # i.e. [[$1][$3]] $text =~ s/\[\[([^\]\[\n]+)\](\[([^\]\n]+)\])?\]/_handleSquareBracketedLink( $this,$theWeb,$theTopic,$1,$3)/ge; + # Mailto e-mail addresses must always be 7-bit, even within I18N sites # Normal mailto:fo...@ex... ('mailto:' part optional) $text =~ s/$STARTWW((mailto\:)?$TWiki::regex{emailAddrRegex})$ENDWW/_mailLink( $this, $1 )/gem; |