Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more trail regression tests
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
goto.pm
diff --git
a/IkiWiki/Plugin/goto.pm
b/IkiWiki/Plugin/goto.pm
index 669211691028b90f748f0d1489e0380a7d97b253..6b596ac8b6af95641dec071071e5be38b3898f87 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 () {
@@
-51,11
+52,11
@@
sub cgi_goto ($;$) {
IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
}
IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
}
- if (! length $link) {
+ if (!
defined $link || !
length $link) {
IkiWiki::cgi_custom_failure(
$q,
"404 Not Found",
IkiWiki::cgi_custom_failure(
$q,
"404 Not Found",
- IkiWiki::
misctemplate(
gettext("missing page"),
+ IkiWiki::
cgitemplate($q,
gettext("missing page"),
"<p>".
sprintf(gettext("The page %s does not exist."),
htmllink("", "", $page)).
"<p>".
sprintf(gettext("The page %s does not exist."),
htmllink("", "", $page)).
@@
-63,7
+64,7
@@
sub cgi_goto ($;$) {
)
}
else {
)
}
else {
- IkiWiki::redirect($q, urlto($link
, undef, 1
));
+ IkiWiki::redirect($q, urlto($link));
}
exit;
}
exit;