X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2ed1419c1d469a3e018c2607ba47da525d97fa3a..d1d212203c72072d9a42f66c171dc6be83225894:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 54e409040..3be8e1c53 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -25,11 +25,13 @@ sub htmlize ($$) { #{{{ my $content=shift; if (! $INC{"/usr/bin/markdown"}) { + # Note: a proper perl module is available in Debian + # for markdown, but not upstream yet. no warnings 'once'; $blosxom::version="is a proper perl module too much to ask?"; use warnings 'all'; do "/usr/bin/markdown"; - use Encode; + require Encode; } if ($type eq '.mdwn') { @@ -171,8 +173,7 @@ sub genpage ($$$) { #{{{ my $title=pagetitle(basename($page)); - my $template=HTML::Template->new(blind_cache => 1, - filename => "$config{templatedir}/page.tmpl"); + my $template=template("page.tmpl", blind_cache => 1); my $actions=0; if (length $config{cgiurl}) {