Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 36282055a5274987747026b284609e45f793208c..ccc9cb6664e5617c514ba6715107a2c4d1ddc448 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -5,7 +5,6 @@ package IkiWiki::Plugin::template;
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use warnings;
 use strict;
 use IkiWiki 3.00;

-use HTML::Template;

 use Encode;
 
 sub import {
 use Encode;
 
 sub import {


@@ -34,58 +33,41 @@ sub preprocess (@) {
                error gettext("missing id parameter")
        }
 
                error gettext("missing id parameter")
        }
 

-       my $template_page="templates/$params{id}";
-       add_depends($params{page}, $template_page);
-
-       my $template_file;
-       if (exists $pagesources{$template_page}) {
-               $template_file=srcfile($pagesources{$template_page});
-       }
-       else {
-               $template_file=template_file("$params{id}.tmpl")
-       }
-       return sprintf(gettext("template %s not found"),
-               htmllink($params{page}, $params{destpage}, "/".$template_page))
-                       unless defined $template_file;
-
+       # The bare id is used, so a page templates/$id can be used as 
+       # the template.

        my $template;
        eval {
        my $template;
        eval {

-               $template=HTML::Template->new(
-                       filter => sub {
-                               my $text_ref = shift;
-                               $$text_ref=&Encode::decode_utf8($$text_ref);
-                               chomp $$text_ref;
-                       },
-                       filename => $template_file,
-                               die_on_bad_params => 0,
-                       no_includes => 1,
-                       blind_cache => 1,
-               );
+               $template=template_depends($params{id}, $params{page},
+                       blind_cache => 1);

        };
        if ($@) {
        };
        if ($@) {

-               error gettext("failed to process:")." $@"
+               # gettext can clobber $@
+               my $error = $@;
+               error sprintf(gettext("failed to process template %s"),
+                       htmllink($params{page}, $params{destpage},
+                               "/templates/$params{id}"))." $error";

        }
 
        $params{basename}=IkiWiki::basename($params{page});
 
        foreach my $param (keys %params) {
                my $value=IkiWiki::preprocess($params{page}, $params{destpage},
        }
 
        $params{basename}=IkiWiki::basename($params{page});
 
        foreach my $param (keys %params) {
                my $value=IkiWiki::preprocess($params{page}, $params{destpage},

-                         IkiWiki::filter($params{page}, $params{destpagea},
-                         $params{$param}), $scan);
+                         $params{$param}, $scan);

                if ($template->query(name => $param)) {
                if ($template->query(name => $param)) {

-                       $template->param($param =>
-                               IkiWiki::htmlize($params{page}, $params{destpage},
+                       my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},

                                        pagetype($pagesources{$params{page}}),
                                        pagetype($pagesources{$params{page}}),

-                                       $value));
+                                       $value);
+                       chomp $htmlvalue;
+                       $template->param($param => $htmlvalue);

                }
                if ($template->query(name => "raw_$param")) {
                }
                if ($template->query(name => "raw_$param")) {

+                       chomp $value;

                        $template->param("raw_$param" => $value);
                }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
                        $template->param("raw_$param" => $value);
                }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},

-              IkiWiki::filter($params{page}, $params{destpage},
-              $template->output), $scan);
+              $template->output, $scan);

 }
 
 1
 }
 
 1