diff options
author | intrigeri <intrigeri@boum.org> | 2009-01-13 12:26:43 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-01-13 12:26:43 +0100 |
commit | 82197bd0eaa216b841caace38c976acc7f6ad3fa (patch) | |
tree | 450f4afafb26d17a54c4917fb20d067c24efcaf7 /IkiWiki/Plugin/rename.pm | |
parent | c8e3136d0091bd024e6dc1f3c21a10a92f2017d4 (diff) | |
parent | 7b1026b1a803e160c360ee8f4d19004b466f8b7c (diff) | |
download | ikiwiki-82197bd0eaa216b841caace38c976acc7f6ad3fa.tar ikiwiki-82197bd0eaa216b841caace38c976acc7f6ad3fa.tar.gz |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/rename.pm')
-rw-r--r-- | IkiWiki/Plugin/rename.pm | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 82639a073..f79349561 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -413,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; } @@ -442,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)=@_; |