only pass named parameters to the canrename hook

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index da5812ebdc9506f1a77a0988438d1d43d99a2936..b579d1f0831a4934017af66fc2079e772cf3b010 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -452,9 +452,9 @@ sub canremove ($$$) {
        return undef;
 }
 
-sub canrename ($$@) {
-       my ($cgi, $session) = (shift, shift);
+sub canrename (@) {
        my %params = @_;
+       my $session = $params{session};
 
        if (istranslation($params{src})) {
                my $masterpage = masterpage($params{src});

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 37f643eefbdc7ce02122fcec10e1a14c814497b7..b43c5282ab0dd841da52017c1a456fc573c052a3 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -91,8 +91,9 @@ sub check_canrename ($$$$$$) {
        my $canrename;
        IkiWiki::run_hooks(canrename => sub {
                return if defined $canrename;
-               my $ret=shift->($q, $session, src => $src, srcfile => $srcfile,
-                               dest => $dest, destfile => $destfile);
+               my $ret=shift->(cgi => $q, session => $session,
+                       src => $src, srcfile => $srcfile,
+                       dest => $dest, destfile => $destfile);
                if (defined $ret) {
                        if ($ret eq "") {
                                $canrename=1;

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index f5e401c050198329ce1269befc05db7f44e9d3fd..ec5a0c72518284c848deb0b2a26aeaa84361aee5 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -191,10 +191,8 @@ sub canremove ($$$) {
        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");
 }

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 4704ba16dfb53563373bc0339272beafbf6c0ffa..b60dc66f201899349e9916137b0f936d3973917e 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -336,10 +336,8 @@ bypass it). It works exactly like the `canedit` hook.
 This hook can be used to implement arbitrary access methods to control when
 a page can be renamed using the web interface (commits from revision control
 bypass it). It works exactly like the `canedit` and `canremove` hook,
-but is passed:
-* a CGI object
-* a session object
-* the named parameters `src`, `srcfile`, `dest` and `destfile`.
+but is passed the named parameters `cgi` (a CGI object), `session` (a
+session object), `src`, `srcfile`, `dest` and `destfile`.
 
 ### checkcontent