remove old unused baseurl parameter

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 439552f62f9d5b3fe97c33d8397a559118e25b71..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 () {
@@ -14,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
+                       section => "web",
                }
 }
 
@@ -40,16 +42,17 @@ sub cgi_goto ($;$) {
 
        IkiWiki::loadindex();
 
-       # If the page is internal (like a comment), see if it has a
-       # permalink. Comments do.
-       if (IkiWiki::isinternal($page) &&
-           defined $pagestate{$page}{meta}{permalink}) {
-               IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
+       my $link;
+       if (! IkiWiki::isinternal($page)) {
+               $link = bestlink("", $page);
+       }
+       elsif (defined $pagestate{$page}{meta}{permalink}) {
+               # Can only redirect to an internal page if it has a
+               # permalink.
+               IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
-       my $link = bestlink("", $page);
-
-       if (! length $link) {
+       if (! defined $link || ! length $link) {
                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",
@@ -61,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link));
        }
 
        exit;