Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 7cc8cb4840f42ec8817ad1ae0a9cec726694b9f0..2e2dc04a111a164745fb628785b509d40e024e6c 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -32,13 +32,19 @@ 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);
@@ -65,7 +71,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);