X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0b9e849aba38f0695491ad5ca27de11632627ffe..885e4b607ae6cdcd48c792ce45c8b7faa29a76fb:/IkiWiki/Plugin/smiley.pm

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index a8fed69e1..70b8cef74 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -8,14 +8,25 @@ use IkiWiki 2.00;
 my %smileys;
 my $smiley_regexp;
 
-sub import { #{{{
+sub import {
 	add_underlay("smiley");
+	hook(type => "getsetup", id => "smiley", call => \&getsetup);
 	hook(type => "sanitize", id => "smiley", call => \&sanitize);
-} # }}}
+}
 
-sub build_regexp () { #{{{
+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) {
+	while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
 		my $smiley=$1;
 		my $file=$2;
 
@@ -39,16 +50,16 @@ sub build_regexp () { #{{{
 	$smiley_regexp='('.join('|', map { quotemeta }
 		reverse sort keys %smileys).')';
 	#debug($smiley_regexp);
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	build_regexp() unless defined $smiley_regexp;
 	
 	$_=$params{content};
 	return $_ unless length $smiley_regexp;
-	
+			
 MATCH:	while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
 		my $escape=$1;
 		my $smiley=$2;
@@ -68,20 +79,22 @@ MATCH:	while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
 			# Reset pos back to where it was before this test.
 			pos=$pos;
 		}
-
+	
 		if ($escape) {
 			# Remove escape.
 			substr($_, $epos, 1)="";
+			pos=$epos+1;
 		}
 		else {
 			# Replace the smiley with its expanded value.
 			substr($_, $spos, length($smiley))=
-				htmllink($params{page}, $params{page},
+				htmllink($params{page}, $params{destpage},
 				         $smileys{$smiley}, linktext => $smiley);
+			pos=$epos+1;
 		}
 	}
 
 	return $_;
-} # }}}
+}
 
 1