avoid redir loop when going to an internal page that has no permalink
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 04:22:05 +0000 (00:22 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 04:22:05 +0000 (00:22 -0400)
IkiWiki/Plugin/goto.pm

index 03bd682b3fed5114d6d43a52d603feb6c3e11348..669211691028b90f748f0d1489e0380a7d97b253 100644 (file)
@@ -41,14 +41,15 @@ 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) {
                IkiWiki::cgi_custom_failure(
 
        if (! length $link) {
                IkiWiki::cgi_custom_failure(