Added a comment

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index f6cebd4cd466eba086aa232bf54381607bc7add7..3d094c263196a7738295f81c8995ce365c5ce091 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -91,6 +91,9 @@ sub cgi_editpage ($$) {
        # This untaint is safe because we check file_pruned and
        # wiki_file_regexp.
        my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
+       if (! defined $page) {
+               error(gettext("bad page name"));
+       }
        $page=possibly_foolish_untaint($page);
        my $absolute=($page =~ s#^/+##); # absolute name used to force location
        if (! defined $page || ! length $page ||
@@ -128,7 +131,8 @@ sub cgi_editpage ($$) {
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
-               $type=$config{default_pageext} unless defined $type;
+               $type=$config{default_pageext}
+                       if ! defined $type || $type=~/^_/; # not internal type
                $file=newpagefile($page, $type);
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);
@@ -312,7 +316,7 @@ sub cgi_editpage ($$) {
                        $form->title(sprintf(gettext("editing %s"), pagetitle(basename($page))));
                }
                
-               showform_preview($form, \@buttons, $session, $q, page => $page);
+               showform($form, \@buttons, $session, $q, page => $page);
        }
        else {
                # save page
@@ -329,7 +333,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
-                       showform_preview($form, \@buttons, $session, $q,
+                       showform($form, \@buttons, $session, $q,
                                page => $page);
                        exit;
                }
@@ -344,7 +348,7 @@ sub cgi_editpage ($$) {
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);
-                       showform_preview($form, \@buttons, $session, $q,
+                       showform($form, \@buttons, $session, $q,
                                page => $page);
                        exit;
                }
@@ -385,7 +389,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
-                       showform_preview($form, \@buttons, $session, $q,
+                       showform($form, \@buttons, $session, $q,
                                page => $page);
                        exit;
                }
@@ -427,7 +431,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
-                       showform_preview($form, \@buttons, $session, $q,
+                       showform($form, \@buttons, $session, $q,
                                page => $page);
                }
                else {