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

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 51b7693334aa6a02448c3bcd8663ccb438fc1e01..116fe7324e5d3b4a770acd6876067eb020cf4ae8 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -38,10 +38,14 @@ sub getsetup () {
 }
 
 sub checkconfig () {
 }
 
 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;
 }
 
 1;

diff --git a/debian/changelog b/debian/changelog
index f4132cb463b100f7ad61c0a12074aaade7f099d0..0026d9ddc8a5befb0824523efda4d312019ec812 100644 (file)
--- 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: 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
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500