From: intrigeri <intrigeri@boum.org>
Date: Tue, 13 Jan 2009 11:26:43 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~262
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=82197bd0eaa216b841caace38c976acc7f6ad3fa

Merge commit 'upstream/master' into prv/po
---

82197bd0eaa216b841caace38c976acc7f6ad3fa
diff --cc IkiWiki/Plugin/rename.pm
index 82639a073,41af3ca4d..f79349561
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@@ -442,11 -405,28 +428,28 @@@ 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 renamepage_hook ($$$$) {
 +sub renamelink_hook ($$$$) {
  	my ($page, $src, $dest, $content)=@_;
  
 -	IkiWiki::run_hooks(renamepage => sub {
 +	IkiWiki::run_hooks(renamelink => sub {
  		$content=shift->(
  			page => $page,
  			oldpage => $src,