bugfix

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

diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 1737775d5f5c8851c8d88e3204c73fc4e427c33c..01e9ce043c90f2eb059f7abc6eb8093de717fb18 100644 (file)
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -3,23 +3,32 @@ package IkiWiki::Plugin::cutpaste;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
-use UNIVERSAL;
+use IkiWiki 3.00;
 
 my %savedtext;
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "cutpaste", call => \&getsetup);
        hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
        hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
        hook(type => "preprocess", id => "paste", call => \&preprocess_paste);
-} # }}}
-
-sub preprocess_cut (@) { #{{{
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess_cut (@) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {
                if (! exists $params{$param}) {
-                       return "[[cut ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
@@ -27,14 +36,14 @@ sub preprocess_cut (@) { #{{{
        $savedtext{$params{page}}->{$params{id}} = $params{text};
 
        return "" if defined wantarray;
-} # }}}
+}
 
-sub preprocess_copy (@) { #{{{
+sub preprocess_copy (@) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {
                if (! exists $params{$param}) {
-                       return "[[copy ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
@@ -43,26 +52,26 @@ sub preprocess_copy (@) { #{{{
 
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
-} # }}}
+}
 
-sub preprocess_paste (@) { #{{{
+sub preprocess_paste (@) {
        my %params=@_;
 
        foreach my $param (qw{id}) {
                if (! exists $params{$param}) {
-                       return "[[paste ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
        if (! exists $savedtext{$params{page}}) {
-               return "[[paste ".gettext('no text was copied in this page')."]]";
+               error gettext('no text was copied in this page');
        }
        if (! exists $savedtext{$params{page}}->{$params{id}}) {
-               return "[[paste ".sprintf(gettext('no text was copied in this page with id %s'), $params{id})."]]";
+               error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
-} # }}}
+}
 
 1;