Merge branch 'master' of git://github.com/joeyh/ikiwiki

1 files changed, 9 insertions, 2 deletions

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fb..c59935672 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,21 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 1,
 		},
+		add_templates => {
+			type => "string",
+			default => [],
+			description => "extra template directories to add",
+			advanced => 1,
+			safe => 0,
+			rebuild => 1,
+		},
 }
 
 sub checkconfig () {
-	return unless exists $config{add_underlays};
-
 	foreach my $dir (@{$config{add_underlays}}) {
 		add_underlay($dir);
 	}
+	push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;