Merge branch 'master' into templatemove

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index dff7771381ddca5d9392d50bae81356c61fd5805..5c94ecbca1839c99dbac697b9c29d5922e7b843d 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,7 @@ sub cgi_editpage ($$) {
                action => $config{cgiurl},
                header => 0,
                table => 0,
-               template => scalar template_params("editpage.tmpl"),
+               template => template("editpage.tmpl"),
        );
        
        decode_form_utf8($form);
@@ -92,7 +92,7 @@ sub cgi_editpage ($$) {
        # wiki_file_regexp.
        my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
        $page=possibly_foolish_untaint($page);
-       my $absolute=($page =~ s#^/+##); # absolute name used for force location
+       my $absolute=($page =~ s#^/+##); # absolute name used to force location
        if (! defined $page || ! length $page ||
            file_pruned($page)) {
                error(gettext("bad page name"));
@@ -221,7 +221,6 @@ sub cgi_editpage ($$) {
                        if (! defined $from || ! length $from ||
                            $from ne $form->field('from') ||
                            file_pruned($from) ||
-                           $from=~/^\// || 
                            $absolute ||
                            $form->submitted) {
                                @page_locs=$best_loc=$page;