From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Nov 2009 17:36:13 +0000 (-0500)
Subject: underlay: Avoid crashing if lists of underlays (or template directories) are not... 
X-Git-Tag: 3.20091113~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=910cbae922ff7805947ea8b01527be1e5a27890b;p=ikiwiki.git

underlay: Avoid crashing if lists of underlays (or template directories) are not configured.
---

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 51b769333..116fe7324 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -38,10 +38,14 @@ sub getsetup () {
 }
 
 sub checkconfig () {
-	foreach my $dir (@{$config{add_underlays}}) {
-		add_underlay($dir);
+	if ($config{add_underlays}) {
+		foreach my $dir (@{$config{add_underlays}}) {
+			add_underlay($dir);
+		}
+	}
+	if ($config{add_templates}) {
+		push @{$config{templatedirs}}, @{$config{add_templates}};
 	}
-	push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;
diff --git a/debian/changelog b/debian/changelog
index f4132cb46..0026d9ddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
 
   * underlay: Fix example values put in setup file to be array
     references.
+  * underlay: Avoid crashing if lists of underlays (or template
+    directories) are not configured.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500