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

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

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fba9919b3023e391bed3237406424f76a..2967761c8d3dab055bb52c098b40cb6762e68f3e 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,10 +18,11 @@ 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,
                        description => "extra underlay directories to add",
                        advanced => 1,
                        safe => 0,


@@ -30,10 +31,10 @@ sub getsetup () {
 }
 
 sub checkconfig () {
 }
 
 sub checkconfig () {

-       return unless exists $config{add_underlays};
-
-       foreach my $dir (@{$config{add_underlays}}) {
-               add_underlay($dir);
+       if ($config{add_underlays}) {
+               foreach my $dir (@{$config{add_underlays}}) {
+                       add_underlay($dir);
+               }

        }
 }
 
        }
 }