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.master
parent
3f5a646a41
commit
34991b7d35
|
@ -9,9 +9,7 @@ use open qw{:utf8 :std};
|
||||||
|
|
||||||
sub import {
|
sub import {
|
||||||
hook(type => "getsetup", id => "otl", call => \&getsetup);
|
hook(type => "getsetup", id => "otl", call => \&getsetup);
|
||||||
hook(type => "filter", id => "otl", call => \&filter);
|
|
||||||
hook(type => "htmlize", id => "otl", call => \&htmlize);
|
hook(type => "htmlize", id => "otl", call => \&htmlize);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sub getsetup () {
|
sub getsetup () {
|
||||||
|
@ -22,10 +20,10 @@ sub getsetup () {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
sub filter (@) {
|
sub htmlize (@) {
|
||||||
my %params=@_;
|
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},
|
my $checked=htmllink($params{page}, $params{page},
|
||||||
"smileys/star_on.png", linktext => "[X]");
|
"smileys/star_on.png", linktext => "[X]");
|
||||||
my $unchecked=htmllink($params{page}, $params{page},
|
my $unchecked=htmllink($params{page}, $params{page},
|
||||||
|
@ -33,12 +31,6 @@ sub filter (@) {
|
||||||
$params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
|
$params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
|
||||||
$params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /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.
|
# Can't use open2 since otl2html doesn't play nice with buffering.
|
||||||
# Instead, fork off a child process that will run otl2html and feed
|
# Instead, fork off a child process that will run otl2html and feed
|
||||||
# it the content. Then read otl2html's response.
|
# it the content. Then read otl2html's response.
|
||||||
|
|
Loading…
Reference in New Issue