Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 96d7f5900b2f0b109b89dc804db31a596c826edc..2633b1ea14cf6ab247ea858e3049c977db5f54bc 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -10,9 +10,20 @@ my $smiley_regexp;
 
 sub import { #{{{
        add_underlay("smiley");
+       hook(type => "getsetup", id => "smiley", call => \&getsetup);
        hook(type => "sanitize", id => "smiley", call => \&sanitize);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       # force a rebuild because turning it off
+                       # removes the smileys, which would break links
+                       rebuild => 1,
+               },
+} #}}}
+
 sub build_regexp () { #{{{
        my $list=readfile(srcfile("smileys.mdwn"));
        while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
@@ -79,11 +90,8 @@ MATCH:       while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                        substr($_, $spos, length($smiley))=
                                htmllink($params{page}, $params{destpage},
                                         $smileys{$smiley}, linktext => $smiley);
+                       pos=$epos+1;
                }
-
-               # Breaks out at end, otherwise it will scan through again,
-               # replacing de-escaped ones.
-               last unless defined pos;
        }
 
        return $_;