Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 740ca8ac443f72ba05336599da5a331d1157f55e..f793495612c2d360dd2df480c33913f0ad801b7b 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -91,7 +91,8 @@ sub check_canrename ($$$$$$) {
        my $canrename;
        IkiWiki::run_hooks(canrename => sub {
                return if defined $canrename;
        my $canrename;
        IkiWiki::run_hooks(canrename => sub {
                return if defined $canrename;

-               my $ret=shift->($src, $q, $session);
+               my $ret=shift->($q, $session, src => $src, srcfile => $srcfile,
+                               dest => $dest, destfile => $destfile);

                if (defined $ret) {
                        if ($ret eq "") {
                                $canrename=1;
                if (defined $ret) {
                        if ($ret eq "") {
                                $canrename=1;


@@ -311,7 +312,7 @@ sub sessioncgi ($$) {
                                required => 1,
                        };
 
                                required => 1,
                        };
 

-                       IkiWiki::run_hooks(rename => sub { shift->(\@torename); });
+                       IkiWiki::run_hooks(rename => sub { shift->(\@torename, $q, $session); });

 
                        # See if any subpages need to be renamed.
                        if ($q->param("subpages") && $src ne $dest) {
 
                        # See if any subpages need to be renamed.
                        if ($q->param("subpages") && $src ne $dest) {


@@ -412,22 +413,8 @@ sub sessioncgi ($$) {
                                $template->param(error => $rename->{error});
                                if ($rename->{src} ne $rename->{dest}) {
                                        $template->param(brokenlinks_checked => 1);
                                $template->param(error => $rename->{error});
                                if ($rename->{src} ne $rename->{dest}) {
                                        $template->param(brokenlinks_checked => 1);

-                                       $template->param(brokenlinks => [
-                                               map {
-                                                       {
-                                                               page => htmllink($rename->{dest}, $rename->{dest}, $_,
-                                                                               noimageinline => 1)
-                                                       }
-                                               } @{$rename->{brokenlinks}}
-                                       ]);
-                                       $template->param(fixedlinks => [
-                                               map {
-                                                       {
-                                                               page => htmllink($rename->{dest}, $rename->{dest}, $_,
-                                                                               noimageinline => 1)
-                                                       }
-                                               } @{$rename->{fixedlinks}}
-                                       ]);
+                                       $template->param(brokenlinks => linklist($rename->{dest}, $rename->{brokenlinks}));
+                                       $template->param(fixedlinks => linklist($rename->{dest}, $rename->{fixedlinks}));

                                }
                                $renamesummary.=$template->output;
                        }
                                }
                                $renamesummary.=$template->output;
                        }


@@ -441,6 +428,23 @@ sub sessioncgi ($$) {
                exit 0;
        }
 }
                exit 0;
        }
 }

+                                               
+sub linklist {
+       # generates a list of links in a form suitable for FormBuilder
+       my $dest=shift;
+       my $list=shift;
+       # converts a list of pages into a list of links
+       # in a form suitable for FormBuilder.
+
+       [map {
+               {
+                       page => htmllink($dest, $dest, $_,
+                                       noimageinline => 1,
+                                       linktext => pagetitle($_),
+                               )
+               }
+       } @{$list}]
+}

 
 sub renamelink_hook ($$$$) {
        my ($page, $src, $dest, $content)=@_;
 
 sub renamelink_hook ($$$$) {
        my ($page, $src, $dest, $content)=@_;