Merge branch 'master' of git://github.com/joeyh/ikiwiki

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

diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index dae3728ba37118dcdc717cafa6e36dd591410231..77d5fb0772846dde323fd78a809f936365224fa5 100644 (file)
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -3,15 +3,24 @@ package IkiWiki::Plugin::more;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 my $linktext = gettext("more");
 
 
 my $linktext = gettext("more");
 

-sub import { #{{{
-       hook(type => "preprocess",  id => "more", call => \&preprocess);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "more", call => \&getsetup);
+       hook(type => "preprocess", id => "more", call => \&preprocess);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}

 
 

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

        my %params=@_;
 
        $params{linktext} = $linktext unless defined $params{linktext};
        my %params=@_;
 
        $params{linktext} = $linktext unless defined $params{linktext};


@@ -24,7 +33,7 @@ sub preprocess (@) { #{{{
        }
        else {
                $params{text}=IkiWiki::preprocess($params{page}, $params{destpage},
        }
        else {
                $params{text}=IkiWiki::preprocess($params{page}, $params{destpage},

-                       IkiWiki::filter($params{page}, $params{text}));
+                       IkiWiki::filter($params{page}, $params{destpage}, $params{text}));

                return "<a name=\"more\"></a>\n\n".$params{text};
        }
 }
                return "<a name=\"more\"></a>\n\n".$params{text};
        }
 }