thanks, markdown. tharkdown.

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index f6cebd4cd466eba086aa232bf54381607bc7add7..8f71dafa89df49a3983f0ae185114a484608c994 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 ||
@@ -312,7 +315,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 +332,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 +347,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 +388,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 +430,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 {