aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 20:36:29 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 20:36:29 +0000
commit8fa477fa28afdee85a973ffe2447538d3371f025 (patch)
treeb5074b3b3c36ddb2f6e01fb185d3d3ec7561eb7c /IkiWiki
parentae97e8fe148069f20f59a0eb960755f488bbf96c (diff)
downloadikiwiki-8fa477fa28afdee85a973ffe2447538d3371f025.tar
ikiwiki-8fa477fa28afdee85a973ffe2447538d3371f025.tar.gz
* Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes
a bug caused by committing changes to smilies.mdwn.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/smiley.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 14b8cacf8..e85abbb85 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -9,21 +9,21 @@ my %smileys;
my $smiley_regexp;
sub import { #{{{
- hook(type => "checkconfig", id => "smiley", call => \&setup);
+ hook(type => "filter", id => "smiley", call => \&filter);
} # }}}
-sub setup () { #{{{
+sub build_regexp () { #{{{
my $list=readfile(srcfile("smileys.mdwn"));
while ($list =~ m/^\s*\*\s+\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
$smileys{$1}=$2;
}
if (! %smileys) {
- debug(gettext("failed to parse any smileys, disabling plugin"));
+ debug(gettext("failed to parse any smileys"));
+ $smiley_regexp='';
return;
}
- hook(type => "filter", id => "smiley", call => \&filter);
# sort and reverse so that substrings come after longer strings
# that contain them, in most cases.
$smiley_regexp='('.join('|', map { quotemeta }
@@ -34,9 +34,10 @@ sub setup () { #{{{
sub filter (@) { #{{{
my %params=@_;
+ build_regexp() unless defined $smiley_regexp;
$params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
$1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, linktext => $2)
- }egs;
+ }egs if length $smiley_regexp;
return $params{content};
} # }}}