X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3316f9cc737c091ff79270f75fc30dd349616b12..093f8534f18f5ac25678fd31857a5da0e43c50d8:/IkiWiki/Plugin/rename.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 740ca8ac4..f79349561 100644
--- 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 $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;
@@ -311,7 +312,7 @@ sub sessioncgi ($$) {
 				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) {
@@ -412,22 +413,8 @@ sub sessioncgi ($$) {
 				$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;
 			}
@@ -441,6 +428,23 @@ sub sessioncgi ($$) {
 		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)=@_;