Merge branch 'master' of git://git.madduck.net/code/ikiwiki

[ikiwiki.git] / IkiWiki / Plugin / smiley.pm

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 1a9833e6eed899ae2ed3a77d337f2e06ea789c29..932c2c4fe928f88e8a140482144290b36c2016bb 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -9,6 +9,7 @@ my %smileys;
 my $smiley_regexp;
 
 sub import { #{{{
+       add_underlay("smiley");
        hook(type => "filter", id => "smiley", call => \&filter);
 } # }}}
 
@@ -36,7 +37,7 @@ sub filter (@) { #{{{
        
        build_regexp() unless defined $smiley_regexp;
        $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
-               $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, linktext => $2)
+               $1 ? $2 : htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2)
        }egs if length $smiley_regexp;
 
        return $params{content};