Merge branch 'master' into revert

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 06ec0bdca476d8d99640358660c5454c5462e426..42d2425ca2a0dbe85b172fee06eb63ec50b07d00 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 () {


@@ -14,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "web",

                }
 }
 
                }
 }
 


@@ -32,20 +34,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();
 
        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(

-                       $q->header(-status => "404 Not Found"),
+                       $q,
+                       "404 Not Found",

                        IkiWiki::misctemplate(gettext("missing page"),
                                "<p>".
                                sprintf(gettext("The page %s does not exist."),
                        IkiWiki::misctemplate(gettext("missing page"),
                                "<p>".
                                sprintf(gettext("The page %s does not exist."),


@@ -65,7 +75,7 @@ sub cgi ($) {
        my $do = $cgi->param('do');
 
        if (defined $do && ($do eq 'goto' || $do eq 'commenter' ||
        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);
                # goto is the preferred name for this; recentchanges_link and
                # commenter are for compatibility with any saved URLs
                cgi_goto($cgi);