factored out an urlabs from aggregate and cgi

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 669211691028b90f748f0d1489e0380a7d97b253..0eb83fc208de611d05a016ff8fc63c2c6913f1c8 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -7,6 +7,7 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "cgi", id => 'goto',  call => \&cgi);
+       hook(type => "getsetup", id => 'goto',  call => \&getsetup);
 }
 
 sub getsetup () {
@@ -51,7 +52,7 @@ sub cgi_goto ($;$) {
                IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
-       if (! length $link) {
+       if (! defined $link || ! length $link) {
                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",
@@ -63,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link));
        }
 
        exit;