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 ab74fc37e77bf82ae6f14ddff78ba34e1f7c392a..2967761c8d3dab055bb52c098b40cb6762e68f3e 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -28,14 +28,6 @@ sub getsetup () {
                        safe => 0,
                        rebuild => 1,
                },
                        safe => 0,
                        rebuild => 1,
                },

-               add_templates => {
-                       type => "string",
-                       example => ["$ENV{HOME}/.ikiwiki/templates"],
-                       description => "extra template directories to add",
-                       advanced => 1,
-                       safe => 0,
-                       rebuild => 1,
-               },

 }
 
 sub checkconfig () {
 }
 
 sub checkconfig () {


@@ -44,9 +36,6 @@ sub checkconfig () {
                        add_underlay($dir);
                }
        }
                        add_underlay($dir);
                }
        }

-       if ($config{add_templates}) {
-               push @{$config{templatedirs}}, @{$config{add_templates}};
-       }

 }
 
 1;
 }
 
 1;