From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Sep 2010 19:44:04 +0000 (-0400)
Subject: avoid fatal error if aggregate page template could not be found
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=00595b62be624b2b105a7b137d0502d235e55f87;p=ikiwiki.git

avoid fatal error if aggregate page template could not be found

That template is user-controlled.
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index fe53d868d..9b70e5df0 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -644,7 +644,14 @@ sub add_page (@) {
 	$guid->{md5}=$digest;
 
 	# Create the page.
-	my $template=template($feed->{template}, blind_cache => 1);
+	my $template;
+	eval {
+		$template=template($feed->{template}, blind_cache => 1);
+	};
+	if ($@) {
+		print STDERR gettext("failed to process template:")." $@";
+		return;
+	}
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
 	$template->param(content => wikiescape(htmlabs($params{content},