urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another fix 

I'm suprised that the second m//g didn't seem to clobber @-, but I don't
want to rely on that, so preserve it beforehand.
master
Joey Hess 2008-03-21 02:57:34 -04:00
parent 88b5a0ece5
commit cd6055a893
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/smiley.pm
View File

@ -43,6 +43,8 @@ sub filter (@) { #{{{
MATCH: while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
my $escape=$1;
my $smiley=$2;
my $epos=$-[1];
my $spos=$-[2];
# Smilies are not allowed inside <pre> or <code>.
# For each tag in turn, match forward to find the next <tag>
@ -60,11 +62,11 @@ MATCH: while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
if ($escape) {
# Remove escape.
substr($_, $-[1], 1)="";
substr($_, $epos, 1)="";
}
else {
# Replace the smiley with its expanded value.
substr($_, $-[2], length($smiley))=
substr($_, $spos, length($smiley))=
htmllink($params{page}, $params{destpage},
$smileys{$smiley}, linktext => $smiley);
}