From: <de...@de...> - 2007-01-30 23:57:06
|
Author: KennethLavrsen Date: 2007-01-30 17:56:42 -0600 (Tue, 30 Jan 2007) New Revision: 12670 Modified: twiki/branches/Patch04x01/lib/TWiki/Render.pm Log: Item3486: Funny characters in topic names cause problems This removes the problem that the render makes a topic like [WikiName. But we should also prevent this on receiving side Modified: twiki/branches/Patch04x01/lib/TWiki/Render.pm =================================================================== --- twiki/branches/Patch04x01/lib/TWiki/Render.pm 2007-01-30 23:54:55 UTC (rev 12669) +++ twiki/branches/Patch04x01/lib/TWiki/Render.pm 2007-01-30 23:56:42 UTC (rev 12670) @@ -1095,8 +1095,8 @@ $text =~ s/(^|\s)\!\[\[/$1\[<nop>\[/gm; # Spaced-out Wiki words with alternative link text # i.e. [[$1][$3]] - $text =~ s/\[\[([^\]\n]+)\](\[([^\]\n]+)\])?\]/$this->_handleSquareBracketedLink($theWeb,$theTopic,$1,$3)/ge; - + $text =~ s/\[\[([^\][\n]+)\](\[([^\]\n]+)\])?\]/$this->_handleSquareBracketedLink($theWeb,$theTopic,$1,$3)/ge; + unless( TWiki::isTrue( $prefs->getPreferencesValue('NOAUTOLINK')) ) { # Handle WikiWords $text = $this->takeOutBlocks( $text, 'noautolink', $removed ); |