aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/otl.pm
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-09 22:50:27 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-09 22:50:27 +0000
commitdae0f48e91304afcb6ebe0936360e51b22a56548 (patch)
tree930090e4343087dac7ae6693d420d80b826c57f2 /IkiWiki/Plugin/otl.pm
parentd92142d09eaec9018c0cdc96f9ad3bd4a0c876a7 (diff)
downloadikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar
ikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar.gz
* Work on firming up the plugin interface:
- Plugins should not need to load IkiWiki::Render to get commonly used functions, so moved some functions from there to IkiWiki. - Picked out the set of functions and variables that most plugins use, documented them, and made IkiWiki export them by default, like a proper perl module should. - Use the other functions at your own risk. - This is not quite complete, I still have to decide whether to export some other things. * Changed all plugins included in ikiwiki to not use "IkiWiki::" when referring to stuff now exported by the IkiWiki module. * Anyone with a third-party ikiwiki plugin is strongly enrouraged to make like changes to it and avoid use of non-exported symboles from "IkiWiki::". * Link debian/changelog and debian/news to NEWS and CHANGELOG. * Support hyperestradier version 1.4.2, which adds a new required phraseform setting.
Diffstat (limited to 'IkiWiki/Plugin/otl.pm')
-rw-r--r--IkiWiki/Plugin/otl.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index b10d5e807..3f3413390 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -7,8 +7,8 @@ use strict;
use IkiWiki;
sub import { #{{{
- IkiWiki::hook(type => "filter", id => "otl", call => \&filter);
- IkiWiki::hook(type => "htmlize", id => "otl", call => \&htmlize);
+ hook(type => "filter", id => "otl", call => \&filter);
+ hook(type => "htmlize", id => "otl", call => \&htmlize);
} # }}}
@@ -16,9 +16,9 @@ sub filter (@) { #{{{
my %params=@_;
# Munge up check boxes to look a little bit better. This is a hack.
- my $checked=IkiWiki::htmllink($params{page}, $params{page},
+ my $checked=htmllink($params{page}, $params{page},
"smileys/star_on.png", 0, 0, "[X]");
- my $unchecked=IkiWiki::htmllink($params{page}, $params{page},
+ my $unchecked=htmllink($params{page}, $params{page},
"smileys/star_off.png", 0, 0, "[_]");
$params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
$params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
@@ -40,7 +40,7 @@ sub htmlize (@) { #{{{
unless (defined $pid) {
$tries--;
if ($tries < 1) {
- IkiWiki::debug("failed to fork: $@");
+ debug("failed to fork: $@");
return $params{content};
}
}
@@ -55,7 +55,7 @@ sub htmlize (@) { #{{{
unless (defined $pid) {
$tries--;
if ($tries < 1) {
- IkiWiki::debug("failed to fork: $@");
+ debug("failed to fork: $@");
print $params{content};
exit;
}
@@ -64,7 +64,7 @@ sub htmlize (@) { #{{{
if (! $pid) {
if (! exec 'otl2html', '-S', '/dev/null', '-T', '/dev/stdin') {
- IkiWiki::debug("failed to run otl2html: $@");
+ debug("failed to run otl2html: $@");
print $params{content};
exit;
}