Merge branch 'master' into cvs

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 7f31fa5ca87b4fd5f26a609ee7c909bb4d741701..6b596ac8b6af95641dec071071e5be38b3898f87 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -56,7 +56,7 @@ sub cgi_goto ($;$) {
                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",
-                       IkiWiki::misctemplate(gettext("missing page"),
+                       IkiWiki::cgitemplate($q, gettext("missing page"),
                                "<p>".
                                sprintf(gettext("The page %s does not exist."),
                                        htmllink("", "", $page)).
@@ -64,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
-               IkiWiki::redirect($q, urlto($link, undef));
+               IkiWiki::redirect($q, urlto($link));
        }
 
        exit;