diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-17 12:34:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-17 12:34:38 -0400 |
| commit | df3a8b183c4e6b50b05ba3c4514563619927c924 (patch) | |
| tree | cf26a75910f51a0297c8d23cf758b1b38babc536 /IkiWiki/Plugin | |
| parent | 4bc6f6cb961232dc1b30224e1c7fc875f3bc65f4 (diff) | |
smiley escaping fixes
Smileys need to be double-escaped to work, since the smiley plugin runs as
a sanitize hook, and markdown helpfully removes one level of escapes first.
There were some bugs in the smiley handling code that made escaped smileys
still be expanded. After unescaping a smiley, it needed to move pos forward
past it or the next pass would expand it.
Also, once the m//g got to the end, it seemed to loop back through and make
one more pass (a difference in perl 5.10's regexp exngine? I observed that
pos was undefined when this happened, so added a `last unless defined pos`.
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/smiley.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 51b32b28f..96d7f5900 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -15,7 +15,7 @@ sub import { #{{{ sub build_regexp () { #{{{ my $list=readfile(srcfile("smileys.mdwn")); - while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { + while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { my $smiley=$1; my $file=$2; @@ -48,7 +48,7 @@ sub sanitize (@) { #{{{ $_=$params{content}; return $_ unless length $smiley_regexp; - + MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) { my $escape=$1; my $smiley=$2; @@ -68,10 +68,11 @@ MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) { # Reset pos back to where it was before this test. pos=$pos; } - + if ($escape) { # Remove escape. substr($_, $epos, 1)=""; + pos=$epos+1; } else { # Replace the smiley with its expanded value. @@ -79,6 +80,10 @@ MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) { htmllink($params{page}, $params{destpage}, $smileys{$smiley}, linktext => $smiley); } + + # Breaks out at end, otherwise it will scan through again, + # replacing de-escaped ones. + last unless defined pos; } return $_; |