X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/529a06b7cc4991f6e78fc59855398f986d2dc21e..5a627f1853b4edcbe38dabcfca37fde477572ef5:/IkiWiki/Plugin/rename.pm

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 09250af81..c3e03496f 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -10,7 +10,7 @@ sub import {
 	hook(type => "formbuilder_setup", id => "rename", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "rename", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "rename", call => \&sessioncgi);
-	hook(type => "rename", id => "rename", call => \&rename);
+	hook(type => "rename", id => "rename", call => \&rename_subpages);
 }
 
 sub getsetup () {
@@ -137,14 +137,16 @@ sub rename_form ($$$) {
 		# insert the standard extensions
 		my @page_types;
 		if (exists $IkiWiki::hooks{htmlize}) {
-			@page_types=grep { !/^_/ }
-				keys %{$IkiWiki::hooks{htmlize}};
+			foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
+				push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
+			}
 		}
+		@page_types=sort @page_types;
 	
 		# make sure the current extension is in the list
 		my ($ext) = $pagesources{$page}=~/\.([^.]+)$/;
 		if (! $IkiWiki::hooks{htmlize}{$ext}) {
-			unshift(@page_types, $ext);
+			unshift(@page_types, [$ext, $ext]);
 		}
 	
 		$f->field(name => "type", type => 'select',
@@ -414,7 +416,7 @@ sub sessioncgi ($$) {
 }
 
 # Add subpages to the list of pages to be renamed, if needed.
-sub rename(@) {
+sub rename_subpages (@) {
 	my %params = @_;
 
 	my %torename = %{$params{torename}};
@@ -478,7 +480,7 @@ sub renamepage_hook ($$$$) {
 	return $content;
 }
 
-sub rename_hook (@) {
+sub rename_hook {
 	my %params = @_;
 
 	my @torename=@{$params{torename}};
@@ -501,6 +503,7 @@ sub rename_hook (@) {
 			$done{$torename->{src}}=1;
 		}
 	}
+
 	push @torename, rename_hook(
 		torename => \@nextset,
 		done => \%done,
@@ -532,7 +535,7 @@ sub do_rename ($$$) {
 		IkiWiki::rcs_rename($rename->{srcfile}, $rename->{destfile});
 	}
 	else {
-		if (! CORE::rename($config{srcdir}."/".$rename->{srcfile},
+		if (! rename($config{srcdir}."/".$rename->{srcfile},
 		             $config{srcdir}."/".$rename->{destfile})) {
 			error("rename: $!");
 		}