* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 0c6f5d4272cba5fb8aff8ea68bf76935fca0b299..932c2c4fe928f88e8a140482144290b36c2016bb 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,27 +3,28 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %smileys;
 my $smiley_regexp;
 
 sub import { #{{{
-       hook(type => "checkconfig", id => "smiley", call => \&setup);
+       add_underlay("smiley");
+       hook(type => "filter", id => "smiley", call => \&filter);
 } # }}}
 
-sub setup () { #{{{
+sub build_regexp () { #{{{
        my $list=readfile(srcfile("smileys.mdwn"));
        while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
                $smileys{$1}=$2;
        }
        
        if (! %smileys) {
-               debug("failed to parse any smileys, disabling plugin");
+               debug(gettext("failed to parse any smileys"));
+               $smiley_regexp='';
                return;
        }
        
-       hook(type => "filter", id => "smiley", call => \&filter);
        # sort and reverse so that substrings come after longer strings
        # that contain them, in most cases.
        $smiley_regexp='('.join('|', map { quotemeta }
@@ -34,10 +35,11 @@ sub setup () { #{{{
 sub filter (@) { #{{{
        my %params=@_;
        
-       $params{content} =~ s{(?<=\s)(\\?)$smiley_regexp(?=\s)}{
-               $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2)
-       }egs;
-       
+       build_regexp() unless defined $smiley_regexp;
+       $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
+               $1 ? $2 : htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2)
+       }egs if length $smiley_regexp;
+
        return $params{content};
 } # }}}