Comments (maybe not so helpful - sorry)

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 8dad92be3e8794c2ef09ed4a518f814fb49be2a5..c3e03496fec167591ad6564e97bff45c3e544641 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -137,14 +137,16 @@ sub rename_form ($$$) {
                # insert the standard extensions
                my @page_types;
                if (exists $IkiWiki::hooks{htmlize}) {
                # 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}) {
        
                # 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',
                }
        
                $f->field(name => "type", type => 'select',


@@ -478,7 +480,7 @@ sub renamepage_hook ($$$$) {
        return $content;
 }
 
        return $content;
 }
 

-sub rename_hook (@) {
+sub rename_hook {

        my %params = @_;
 
        my @torename=@{$params{torename}};
        my %params = @_;
 
        my @torename=@{$params{torename}};