From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 19:11:51 +0000 (-0400)
Subject: otl: Avoid globally filtering non-otl pages
X-Git-Tag: 3.14159265~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/34991b7d35a3e0e4c42fcd0c946e2ef8265245de?ds=sidebyside;hp=--cc

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.
---

34991b7d35a3e0e4c42fcd0c946e2ef8265245de
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