X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/832d4d31d177d5d5f848250496048a00e9d70e2f..ea753782b222bf4ba2fb4683b6363afdd9055b64:/IkiWiki/Plugin/skeleton.pm.example?ds=sidebyside

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 30c8dbd5c..573510191 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -30,11 +30,14 @@ 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 => "canremove", id => "skeleton", call => \&canremove);
+	hook(type => "canrename", id => "skeleton", call => \&canrename);
 	hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
 	hook(type => "editcontent", id => "skeleton", call => \&editcontent);
 	hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "skeleton", call => \&formbuilder);
+	hook(type => "renamepage", id => "skeleton", call => \&renamepage);
+	hook(type => "rename", id => "skeleton", call => \&rename);
 	hook(type => "savestate", id => "skeleton", call => \&savestate);
 }
 
@@ -182,36 +185,22 @@ 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;
+sub canremove (@) {
+	my %params=@_;
 
 	debug("skeleton plugin running in canremove");
 }
 
-sub canrename ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
+sub canrename (@) {
+	my %params=@_;
 
 	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 ($$$) {
@@ -234,6 +223,18 @@ sub formbuilder (@) {
 	debug("skeleton plugin running in formbuilder");
 }
 
+sub renamepage (@) {
+	my %params=@_;
+	
+	debug("skeleton plugin running in renamepage");
+}
+
+sub rename (@) {
+	my %params=@_;
+	
+	debug("skeleton plugin running in rename");
+}
+
 sub savestate () {
 	debug("skeleton plugin running in savestate");
 }