X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4d4c15a7c6f3ee073bf6d8aaf9a9a8b0b4c7fb40..46847790a583af31ac221c3142a167cdcc845fc9:/IkiWiki/Plugin/trail.pm

diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index d5fb2b5d6..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}) {