X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/39056453424dcb7e01f69c502192e45604d1fe84..7f5c2cfa5a987d887f42d6db95f80f42ceb3b5ff:/IkiWiki/Plugin/smiley.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 7a9026025..6f4f49d18 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,18 +3,18 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.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 getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -22,10 +22,17 @@ sub getsetup () { #{{{
 			# removes the smileys, which would break links
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub build_regexp () { #{{{
-	my $list=readfile(srcfile("smileys.mdwn"));
+sub build_regexp () {
+	my $srcfile = srcfile("smileys.mdwn", 1);
+	if (! defined $srcfile) {
+		print STDERR sprintf(gettext("smiley plugin will not work without %s"),
+			"smileys.mdwn")."\n";
+		$smiley_regexp='';
+		return;
+	}
+	my $list=readfile($srcfile);
 	while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
 		my $smiley=$1;
 		my $file=$2;
@@ -50,9 +57,9 @@ 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;
@@ -87,18 +94,14 @@ MATCH:	while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
 		}
 		else {
 			# Replace the smiley with its expanded value.
-			substr($_, $spos, length($smiley))=
-				htmllink($params{page}, $params{destpage},
+			my $link=htmllink($params{page}, $params{destpage},
 				         $smileys{$smiley}, linktext => $smiley);
-			pos=$epos+1;
+			substr($_, $spos, length($smiley))=$link;
+			pos=$epos+length($link);
 		}
-
-		# Breaks out at end, otherwise it will scan through again,
-		# replacing de-escaped ones.
-		#last unless defined pos;
 	}
 
 	return $_;
-} # }}}
+}
 
 1