...and IRC

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 0c6f5d4272cba5fb8aff8ea68bf76935fca0b299..14b8cacf8c3385dc01a351474c2119ac942d2d80 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -19,7 +19,7 @@ sub setup () { #{{{
        }
        
        if (! %smileys) {
        }
        
        if (! %smileys) {

-               debug("failed to parse any smileys, disabling plugin");
+               debug(gettext("failed to parse any smileys, disabling plugin"));

                return;
        }
        
                return;
        }
        


@@ -34,10 +34,10 @@ sub setup () { #{{{
 sub filter (@) { #{{{
        my %params=@_;
        
 sub filter (@) { #{{{
        my %params=@_;
        

-       $params{content} =~ s{(?<=\s)(\\?)$smiley_regexp(?=\s)}{
-               $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2)
+       $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
+               $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, linktext => $2)

        }egs;
        }egs;

-       
+

        return $params{content};
 } # }}}
 
        return $params{content};
 } # }}}