X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b0361b8efde26fbf4f3207be6c3c8f39eb16a9f3..8cde2365e43f1c96432dcedb378be55d2308dd08:/IkiWiki/Plugin/goto.pm diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm index 7cc8cb484..03bd682b3 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,27 @@ 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}) { - redirect($q, $pagestate{$page}{meta}{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"), "
". sprintf(gettext("The page %s does not exist."), @@ -65,7 +73,7 @@ sub cgi ($) { my $do = $cgi->param('do'); if (defined $do && ($do eq 'goto' || $do eq 'commenter' || - $do eq 'recentchanged_link')) { + $do eq 'recentchanges_link')) { # goto is the preferred name for this; recentchanges_link and # commenter are for compatibility with any saved URLs cgi_goto($cgi);