* Fix the template, toggle, and conditional plugins to filter text before

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 85a719337518fc3443b501318ce54ec3847af63b..45d00abea2cbec47df02e05d9d93d5c8fcf9d08e 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -34,10 +34,10 @@ sub setup () { #{{{
 sub filter (@) { #{{{
        my %params=@_;
        
-       $params{content} =~ s{(?<=\s)(\\?)$smiley_regexp(?=\s)}{
+       $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
                $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2)
        }egs;
-       
+
        return $params{content};
 } # }}}