X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fc5c938b195bacd8db2be7a435cb88bfbd050af8..bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd:/IkiWiki/Plugin/trail.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index 34a2ca5b6..476db4dcb 100644
--- a/IkiWiki/Plugin/trail.pm
+++ b/IkiWiki/Plugin/trail.pm
@@ -62,12 +62,20 @@ sub getsetup () {
 		},
 }
 
+# Cache of pages' old titles, so we can tell whether they changed
+my %old_trail_titles;
+
 sub needsbuild (@) {
 	my $needsbuild=shift;
+
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{trail}) {
 			if (exists $pagesources{$page} &&
 			    grep { $_ eq $pagesources{$page} } @$needsbuild) {
+				# Remember its title, so we can know whether
+				# it changed.
+				$old_trail_titles{$page} = title_of($page);
+
 				# Remove state, it will be re-added
 				# if the preprocessor directive is still
 				# there during the rebuild. {item} is the
@@ -78,6 +86,7 @@ sub needsbuild (@) {
 			}
 		}
 	}
+
 	return $needsbuild;
 }
 
@@ -230,6 +239,12 @@ sub trails_differ {
 		if (! exists $new->{$trail}) {
 			return 1;
 		}
+
+		if (exists $old_trail_titles{$trail} &&
+			title_of($trail) ne $old_trail_titles{$trail}) {
+			return 1;
+		}
+
 		my ($old_p, $old_n) = @{$old->{$trail}};
 		my ($new_p, $new_n) = @{$new->{$trail}};
 		$old_p = "" unless defined $old_p;
@@ -239,9 +254,20 @@ sub trails_differ {
 		if ($old_p ne $new_p) {
 			return 1;
 		}
+
+		if (exists $old_trail_titles{$old_p} &&
+			title_of($old_p) ne $old_trail_titles{$old_p}) {
+			return 1;
+		}
+
 		if ($old_n ne $new_n) {
 			return 1;
 		}
+
+		if (exists $old_trail_titles{$old_n} &&
+			title_of($old_n) ne $old_trail_titles{$old_n}) {
+			return 1;
+		}
 	}
 
 	foreach my $trail (keys %$new) {
@@ -293,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}) {
@@ -318,8 +343,6 @@ sub prerender {
 			$prev = $members->[$i - 1] if $i > 0;
 			my $next = $members->[$i + 1];
 
-			add_depends($member, $trail);
-
 			$member_to_trails{$member}{$trail} = [$prev, $next];
 		}
 
@@ -335,7 +358,7 @@ sub prerender {
 		if (exists $pagestate{$member}{trail}{item} &&
 			! exists $member_to_trails{$member}) {
 			$rebuild_trail_members{$member} = 1;
-			delete $pagestate{$member}{trailitem};
+			delete $pagestate{$member}{trail}{item};
 		}
 	}
 
@@ -359,6 +382,12 @@ sub prerender {
 sub build_affected {
 	my %affected;
 
+	# In principle we might not have done this yet, although in practice
+	# at least the trail itself has probably changed, and its template
+	# almost certainly contains TRAILS or TRAILLOOP, triggering our
+	# prerender as a side-effect.
+	prerender();
+
 	foreach my $member (keys %rebuild_trail_members) {
 		$affected{$member} = sprintf(gettext("building %s, its previous or next page has changed"), $member);
 	}
@@ -381,6 +410,8 @@ sub pagetemplate (@) {
 	my $page = $params{page};
 	my $template = $params{template};
 
+	return unless length $page;
+
 	if ($template->query(name => 'trails') && ! $recursive) {
 		prerender();
 
@@ -406,13 +437,11 @@ sub pagetemplate (@) {
 			my ($prevurl, $nexturl, $prevtitle, $nexttitle);
 
 			if (defined $prev) {
-				add_depends($params{destpage}, $prev);
 				$prevurl = urlto($prev, $page);
 				$prevtitle = title_of($prev);
 			}
 
 			if (defined $next) {
-				add_depends($params{destpage}, $next);
 				$nexturl = urlto($next, $page);
 				$nexttitle = title_of($next);
 			}