Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/pagetemplate.pm b/IkiWiki/Plugin/pagetemplate.pm
index 99a66ee96964f9750ab3d2d41a6ec87755cd31a0..1d8a84ca77726d5d8486fc632b2606b98e25b5f6 100644 (file)
--- a/IkiWiki/Plugin/pagetemplate.pm
+++ b/IkiWiki/Plugin/pagetemplate.pm
@@ -3,25 +3,25 @@ package IkiWiki::Plugin::pagetemplate;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %templates;
 
 
 my %templates;
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "pagetemplate", call => \&getsetup);
        hook(type => "preprocess", id => "pagetemplate", call => \&preprocess);
        hook(type => "templatefile", id => "pagetemplate", call => \&templatefile);
        hook(type => "getsetup", id => "pagetemplate", call => \&getsetup);
        hook(type => "preprocess", id => "pagetemplate", call => \&preprocess);
        hook(type => "templatefile", id => "pagetemplate", call => \&templatefile);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return 
                plugin => {
                        safe => 1,
                        rebuild => undef,
                },
        return 
                plugin => {
                        safe => 1,
                        rebuild => undef,
                },

-} #}}}
+}

 
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        if (! exists $params{template} ||
        my %params=@_;
 
        if (! exists $params{template} ||


@@ -35,9 +35,9 @@ sub preprocess (@) { #{{{
        }
 
        return "";
        }
 
        return "";

-} # }}}
+}

 
 

-sub templatefile (@) { #{{{
+sub templatefile (@) {

        my %params=@_;
 
        if (exists $templates{$params{page}}) {
        my %params=@_;
 
        if (exists $templates{$params{page}}) {


@@ -45,6 +45,6 @@ sub templatefile (@) { #{{{
        }
        
        return undef;
        }
        
        return undef;

-} # }}}
+}

 
 1
 
 1