X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/affd4ca3daa8da233d915516fb668c8f99fffe51..cddb39cbf5d385273645f62f15bdf29b7607aac2:/IkiWiki/Plugin/goto.pm

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 3f40c5859..669211691 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -14,6 +14,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
@@ -32,20 +33,28 @@ sub cgi_goto ($;$) {
 		}
 	}
 
+	# It's possible that $page is not a valid page name;
+	# if so attempt to turn it into one.
+	if ($page !~ /$config{wiki_file_regexp}/) {
+		$page=titlepage($page);
+	}
+
 	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(
-			$q->header(-status => "404 Not Found"),
+			$q,
+			"404 Not Found",
 			IkiWiki::misctemplate(gettext("missing page"),
 				"<p>".
 				sprintf(gettext("The page %s does not exist."),