oh, and spamassassin too

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 42d2425ca2a0dbe85b172fee06eb63ec50b07d00..3a946b19da9a487a5e76b395a709a2629560dff4 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -27,7 +27,7 @@ sub cgi_goto ($;$) {
        my $page = shift;
 
        if (!defined $page) {
        my $page = shift;
 
        if (!defined $page) {

-               $page = IkiWiki::decode_utf8($q->param("page"));
+               $page = IkiWiki::decode_utf8(scalar $q->param("page"));

 
                if (!defined $page) {
                        error("missing page parameter");
 
                if (!defined $page) {
                        error("missing page parameter");


@@ -52,11 +52,11 @@ sub cgi_goto ($;$) {
                IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
                IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 

-       if (! length $link) {
+       if (! defined $link || ! length $link) {

                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",
                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)).
                                "<p>".
                                sprintf(gettext("The page %s does not exist."),
                                        htmllink("", "", $page)).


@@ -64,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
                )
        }
        else {

-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link));

        }
 
        exit;
        }
 
        exit;