Merge remote branch 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fba9919b3023e391bed3237406424f76a..3ea19c63519bdecf6cd7331d21d722b3e0bc72de 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -21,7 +21,7 @@ sub getsetup () {
                },
                add_underlays => {
                        type => "string",
-                       default => [],
+                       example => ["$ENV{HOME}/wiki.underlay"],
                        description => "extra underlay directories to add",
                        advanced => 1,
                        safe => 0,
@@ -30,10 +30,10 @@ sub getsetup () {
 }
 
 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);
+               }
        }
 }