Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index dae3728ba37118dcdc717cafa6e36dd591410231..4484441c37e3fe9338cb5ab96512913da7201032 100644 (file)
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -3,14 +3,23 @@ package IkiWiki::Plugin::more;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my $linktext = gettext("more");
 
 sub import { #{{{
-       hook(type => "preprocess",  id => "more", call => \&preprocess);
+       hook(type => "getsetup", id => "more", call => \&getsetup);
+       hook(type => "preprocess", id => "more", call => \&preprocess);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub preprocess (@) { #{{{
        my %params=@_;
 
@@ -24,7 +33,7 @@ sub preprocess (@) { #{{{
        }
        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};
        }
 }