X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/54f600af14bf6dc067ffc30ec6f22d517001fe99..c037714b77535c849c8d8ef4807af2b59737a5c5:/IkiWiki/Plugin/template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 98a13b5fa..3df06e652 100644
--- 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 HTML::Template;
 use Encode;
 
 sub import {
@@ -34,58 +33,39 @@ sub preprocess (@) {
 		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=IkiWiki::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 {
-		$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 ($@) {
-		error gettext("failed to process:")." $@"
+		error sprintf(gettext("failed to process template %s"),
+			htmllink($params{page}, $params{destpage},
+				"/templates/$params{id}"))." $@";
 	}
 
 	$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)) {
-			$template->param($param =>
-				IkiWiki::htmlize($params{page}, $params{destpage},
+			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
-					$value));
+					$value);
+			chomp $htmlvalue;
+			$template->param($param => $htmlvalue);
 		}
 		if ($template->query(name => "raw_$param")) {
+			chomp $value;
 			$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