diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-23 15:11:51 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-23 15:11:51 -0400 |
commit | 34991b7d35a3e0e4c42fcd0c946e2ef8265245de (patch) | |
tree | 538f858eb98092072167b71df7bda0c518433602 | |
parent | 3f5a646a41bf00cd9ad3d99be214434dee10787a (diff) | |
download | ikiwiki-34991b7d35a3e0e4c42fcd0c946e2ef8265245de.tar ikiwiki-34991b7d35a3e0e4c42fcd0c946e2ef8265245de.tar.gz |
otl: Avoid globally filtering non-otl pages
Through a complex chain of circumstances, that filtering was causing
dumpsetup to trigger undefined warning messages from the po plugin. But
anyway, munging the otl in htmlize is less error-prone and less expensive,
a win all around.
-rw-r--r-- | IkiWiki/Plugin/otl.pm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm index c68fcbbe3..3ab2441bf 100644 --- a/IkiWiki/Plugin/otl.pm +++ b/IkiWiki/Plugin/otl.pm @@ -9,9 +9,7 @@ use open qw{:utf8 :std}; sub import { hook(type => "getsetup", id => "otl", call => \&getsetup); - hook(type => "filter", id => "otl", call => \&filter); hook(type => "htmlize", id => "otl", call => \&htmlize); - } sub getsetup () { @@ -22,22 +20,16 @@ sub getsetup () { }, } -sub filter (@) { +sub htmlize (@) { my %params=@_; - - # Munge up check boxes to look a little bit better. This is a hack. + + # Munge up check boxes to look a little bit better. my $checked=htmllink($params{page}, $params{page}, "smileys/star_on.png", linktext => "[X]"); my $unchecked=htmllink($params{page}, $params{page}, "smileys/star_off.png", linktext => "[_]"); $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg; $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg; - - return $params{content}; -} - -sub htmlize (@) { - my %params=@_; # Can't use open2 since otl2html doesn't play nice with buffering. # Instead, fork off a child process that will run otl2html and feed |