diff options
| author | intrigeri <intrigeri@boum.org> | 2010-08-22 11:05:03 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-08-22 11:05:03 +0200 |
| commit | 474b6524e0fe4b4bb3402bf6551bf97be7f3ee1f (patch) | |
| tree | f303c5391cb168793bdd8d08265d37900eb96330 /IkiWiki/Plugin/smiley.pm | |
| parent | 0055354e3cce1d1fb8ea2ac0d5c67a4c16a2b0b0 (diff) | |
| parent | 20ecef4d024f751481645db3aa68d098e1251b19 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/smiley.pm')
| -rw-r--r-- | IkiWiki/Plugin/smiley.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 0d77916d0..6f4f49d18 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -25,7 +25,14 @@ sub getsetup () { } 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; |