Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index c599356728e39dddcf729f62cbe5e78ada939f50..2967761c8d3dab055bb52c098b40cb6762e68f3e 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,30 +18,24 @@ sub getsetup () {
                plugin => {
                        safe => 0,
                        rebuild => undef,
                plugin => {
                        safe => 0,
                        rebuild => undef,

+                       section => "special-purpose",

                },
                add_underlays => {
                        type => "string",
                },
                add_underlays => {
                        type => "string",

-                       default => [],
+                       example => ["$ENV{HOME}/wiki.underlay"],

                        description => "extra underlay directories to add",
                        advanced => 1,
                        safe => 0,
                        rebuild => 1,
                },
                        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 () {
 }
 
 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;
 }
 
 1;