Merge branch 'master' of git://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / underlay.pm

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index c599356728e39dddcf729f62cbe5e78ada939f50..3ea19c63519bdecf6cd7331d21d722b3e0bc72de 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -21,27 +21,20 @@ sub getsetup () {
                },
                add_underlays => {
                        type => "string",
-                       default => [],
+                       example => ["$ENV{HOME}/wiki.underlay"],
                        description => "extra underlay directories to add",
                        advanced => 1,
                        safe => 0,
                        rebuild => 1,
                },
-               add_templates => {
-                       type => "string",
-                       default => [],
-                       description => "extra template directories to add",
-                       advanced => 1,
-                       safe => 0,
-                       rebuild => 1,
-               },
 }
 
 sub checkconfig () {
-       foreach my $dir (@{$config{add_underlays}}) {
-               add_underlay($dir);
+       if ($config{add_underlays}) {
+               foreach my $dir (@{$config{add_underlays}}) {
+                       add_underlay($dir);
+               }
        }
-       push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;