Pass along wrapper args to ikiwiki, then handle the "cvs add dir"

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index eb6a7bbcb845bbe2563a7f3e7e0a84f5af0c2a5c..467cd9ed5bf54827da0f75d03304918ba8947a71 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -230,7 +230,7 @@ sub cgi_editpage ($$) {
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') && length $form->field('subpage')) ||
-                                   $page eq gettext('discussion')) {
+                                   $page eq lc(gettext('Discussion'))) {
                                        $best_loc="$from/$page";
                                }
                                else {
@@ -277,14 +277,10 @@ sub cgi_editpage ($$) {
                        my @page_types;
                        if (exists $hooks{htmlize}) {
                                foreach my $key (grep { !/^_/ } keys %{$hooks{htmlize}}) {
-                                       my $pluginref = ${$hooks{htmlize}}{$key};
-                                       if(${$pluginref}{'longname'}) {
-                                               push @page_types, [$key, ${$pluginref}{'longname'}];
-                                       } else {
-                                               push @page_types, [$key, $key];
-                                       }
+                                       push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
                                }
                        }
+                       @page_types=sort @page_types;
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',