add news item for ikiwiki 3.20101129

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 03bd682b3fed5114d6d43a52d603feb6c3e11348..348a663efdd936d5004e0735ad41e4c393568c3e 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);
 
 sub import {
        hook(type => "cgi", id => 'goto',  call => \&cgi);

+       hook(type => "getsetup", id => 'goto',  call => \&getsetup);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -41,16 +42,17 @@ sub cgi_goto ($;$) {
 
        IkiWiki::loadindex();
 
 
        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",
                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",