X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/df3a8b183c4e6b50b05ba3c4514563619927c924..4c68e149e58e09a1f7f1438768dd9eeeafbe20e6:/IkiWiki/Plugin/smiley.pm?ds=inline

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 96d7f5900..2633b1ea1 100644
--- 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 $_;