Fix inline plugin for non-ASCII rootpage

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

diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index cb94855fdd1181cb8113001f838db491db0bcc4d..01e17d61465e70de1c725eec20860e3b1a0e1478 100644 (file)
--- a/IkiWiki/Plugin/trail.pm
+++ b/IkiWiki/Plugin/trail.pm
@@ -160,7 +160,7 @@ sub preprocess_trailitems (@) {
 
        if (exists $params{pagenames}) {
                push @{$pagestate{$params{page}}{trail}{contents}},
-                       [pagenames => (split ' ', $params{pagenames})];
+                       [pagenames => (map { linkpage $_ } split ' ', $params{pagenames})];
        }
 
        return "";
@@ -319,10 +319,9 @@ sub prerender {
                }
 
                if (defined $pagestate{$trail}{trail}{sort}) {
-                       # re-sort
-                       @$members = pagespec_match_list($trail, 'internal(*)',
-                               list => $members,
-                               sort => $pagestate{$trail}{trail}{sort});
+                       @$members = IkiWiki::sort_pages(
+                               $pagestate{$trail}{trail}{sort},
+                               $members);
                }
 
                if (IkiWiki::yesno $pagestate{$trail}{trail}{reverse}) {
@@ -411,6 +410,8 @@ sub pagetemplate (@) {
        my $page = $params{page};
        my $template = $params{template};
 
+       return unless length $page;
+
        if ($template->query(name => 'trails') && ! $recursive) {
                prerender();