Merge commit 'remotes/jmtd/friendly_markup_names'

[ikiwiki.git] / IkiWiki / Plugin / editpage.pm

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 0068a6b118cd15ca7e110a51fdf81fa1ab313526..af42097baedc2acb46534e9c818e0124ec0dc82b 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -276,8 +276,9 @@ sub cgi_editpage ($$) {
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {
-                               @page_types=grep { !/^_/ }
-                                       keys %{$hooks{htmlize}};
+                               foreach my $key (grep { !/^_/ } keys %{$hooks{htmlize}}) {
+                                       push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
+                               }
                        }
                        
                        $form->tmpl_param("page_select", 1);