Merge commit 'upstream/master' into prv/po

[ikiwiki.git] / IkiWiki / Plugin / skeleton.pm.example

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index ea7d6e47f576b3cb04ffeb79d9471fdab1cfa9b1..30c8dbd5c82d06dde62bc7a219fbcbf77bd64177 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -30,6 +30,7 @@ sub import {
        hook(type => "auth", id => "skeleton", call => \&auth);
        hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
        hook(type => "canedit", id => "skeleton", call => \&canedit);
+       hook(type => "cansave", id => "skeleton", call => \&cansave);
        hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
        hook(type => "editcontent", id => "skeleton", call => \&editcontent);
        hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
@@ -181,10 +182,36 @@ sub canedit ($$$) {
        debug("skeleton plugin running in canedit");
 }
 
+<<<<<<< HEAD:IkiWiki/Plugin/skeleton.pm.example
+sub cansave ($$$$) {
+       my $page=shift;
+       my $content=shift;
+       my $cgi=shift;
+       my $session=shift;
+
+       debug("skeleton plugin running in cansave");
+}
+
+sub canremove ($$$) {
+       my $page=shift;
+       my $cgi=shift;
+       my $session=shift;
+
+       debug("skeleton plugin running in canremove");
+}
+
+sub canrename ($$$) {
+       my $page=shift;
+       my $cgi=shift;
+       my $session=shift;
+
+       debug("skeleton plugin running in canrename");
+=======
 sub checkcontent (@) {
        my %params=@_;
 
        debug("skeleton plugin running in checkcontent");
+>>>>>>> upstream/master:IkiWiki/Plugin/skeleton.pm.example
 }
 
 sub editcontent ($$$) {