Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebuild for jessie-backports
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
smiley.pm
diff --git
a/IkiWiki/Plugin/smiley.pm
b/IkiWiki/Plugin/smiley.pm
index 1697a37c1981d0520f1966a53cd647324fcb2ba8..6f4f49d18f4b3fb08d0d73a8ba877987fb12a94d 100644
(file)
--- a/
IkiWiki/Plugin/smiley.pm
+++ b/
IkiWiki/Plugin/smiley.pm
@@
-25,7
+25,14
@@
sub getsetup () {
}
sub build_regexp () {
}
sub build_regexp () {
- my $list=readfile(srcfile("smileys.mdwn"));
+ 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;
while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
my $smiley=$1;
my $file=$2;
@@
-87,10
+94,10
@@
MATCH: while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
}
else {
# Replace the smiley with its expanded value.
}
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);
$smileys{$smiley}, linktext => $smiley);
- pos=$epos+1;
+ substr($_, $spos, length($smiley))=$link;
+ pos=$epos+length($link);
}
}
}
}