X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/95bfa99e2abf9d717f0eb42891f3175edcb7a8e5..d5fb38bd0f7110f6b7ec3779ba5df922ba7e69e3:/IkiWiki/Plugin/trail.pm

diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index cb94855fd..01e17d614 100644
--- 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();