diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
| commit | f4a1732b0e65ea4459098e4e852dff10a5af9320 (patch) | |
| tree | 60b8cf4b1677504cb86f301bb62a33cc769fafd9 /IkiWiki/Plugin/smiley.pm | |
| parent | cc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff) | |
| parent | 0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff) | |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/smiley.pm')
| -rw-r--r-- | IkiWiki/Plugin/smiley.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 1697a37c1..0d77916d0 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -87,10 +87,10 @@ MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) { } else { # Replace the smiley with its expanded value. - substr($_, $spos, length($smiley))= - htmllink($params{page}, $params{destpage}, + my $link=htmllink($params{page}, $params{destpage}, $smileys{$smiley}, linktext => $smiley); - pos=$epos+1; + substr($_, $spos, length($smiley))=$link; + pos=$epos+length($link); } } |