cherry-pick uri security fix

[git.ikiwiki.info.git] / IkiWiki / Plugin / otl.pm

diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index b10d5e80724a315c5c277087f99aa0464d743c22..20291d7e535aecb1e6d1fe36a7ed713aec7edf84 100644 (file)
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -4,11 +4,11 @@ package IkiWiki::Plugin::otl;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 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,10 +16,10 @@ 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},
-               "smileys/star_on.png", 0, 0, "[X]");
-       my $unchecked=IkiWiki::htmllink($params{page}, $params{page},
-               "smileys/star_off.png", 0, 0, "[_]");
+       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;
         
@@ -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;
                        }