From: <de...@de...> - 2009-03-28 05:48:44
|
Author: PeterThoeny Date: 2009-03-28 00:48:25 -0500 (Sat, 28 Mar 2009) New Revision: 17912 Trac url: http://develop.twiki.org/trac/changeset/17912 Modified: twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm Log: Item6165: Fix for broken link if link text contains e-mail address Modified: twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm =================================================================== --- twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm 2009-03-27 05:50:00 UTC (rev 17911) +++ twiki/branches/TWikiRelease04x03/lib/TWiki/Render.pm 2009-03-28 05:48:25 UTC (rev 17912) @@ -1172,8 +1172,7 @@ # Mailto # Email 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; + # Fix for Item6165: Moved mailto rendering to below [[][]] rendering (broken link if link text has e-mail address) # Handle [[][] and [[]] links # Escape rendering: Change ' ![[...' to ' [<nop>[...', for final unrendered ' [[...' output @@ -1182,6 +1181,9 @@ # i.e. [[$1][$3]] $text =~ s/\[\[([^\]\[\n]+)\](\[([^\]\n]+)\])?\]/_handleSquareBracketedLink( $this,$theWeb,$theTopic,$1,$3)/ge; + # Normal mailto:fo...@ex... ('mailto:' part optional) + $text =~ s/$STARTWW((mailto\:)?$TWiki::regex{emailAddrRegex})$ENDWW/_mailLink( $this, $1 )/gem; + unless( TWiki::isTrue( $prefs->getPreferencesValue('NOAUTOLINK')) ) { # Handle WikiWords $text = $this->takeOutBlocks( $text, 'noautolink', $removed ); |