From 34991b7d35a3e0e4c42fcd0c946e2ef8265245de Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Sep 2009 15:11:51 -0400 Subject: 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. --- IkiWiki/Plugin/otl.pm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'IkiWiki') 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 -- cgit v1.2.3