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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 42d2425ca2a0dbe85b172fee06eb63ec50b07d00..348a663efdd936d5004e0735ad41e4c393568c3e 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -52,7 +52,7 @@ sub cgi_goto ($;$) {
                IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
-       if (! length $link) {
+       if (! defined $link || ! length $link) {
                IkiWiki::cgi_custom_failure(
                        $q,
                        "404 Not Found",

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 872537c726c2f62500e836babc9bccd50a2e95fd..934e64bed708f032283c11660add6ac02d8ffe4a 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -74,7 +74,6 @@ sub checkconfig () {
                                },
                                longname => sprintf(gettext("Source code: %s"), $file),
                                @opts,
-                               last => 1,
                        );
                }
        }