X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/59ad31c24220f16c6aa52d187ecca215c914831c..957ded9d64ca6abf0127c5c49e24177685bac5ae:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d5ad11d43..fc4e00a83 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -197,7 +197,7 @@ sub preprocess_inline (@) {
 		        split ' ', $params{pagenames};
 	}
 	else {
-		add_depends($params{page}, $params{pages});
+		add_depends($params{page}, $params{pages}, presence => $quick);
 
 		@list = pagespec_match_list(
 			[ grep { $_ ne $params{page} } keys %pagesources ],
@@ -247,13 +247,6 @@ sub preprocess_inline (@) {
 		@list=@list[0..$params{show} - 1];
 	}
 
-	# Explicitly add all currently displayed pages as dependencies, so
-	# that if they are removed or otherwise changed, the inline will be
-	# sure to be updated.
-	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-		add_depends($params{page}, $p);
-	}
-	
 	if ($feeds && exists $params{feedpages}) {
 		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
 	}
@@ -306,17 +299,7 @@ sub preprocess_inline (@) {
 		# Add a blog post form, with feed buttons.
 		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
-		my $rootpage;
-		if (exists $params{rootpage}) {
-			$rootpage=bestlink($params{page}, $params{rootpage});
-			if (!length $rootpage) {
-				$rootpage=$params{rootpage};
-			}
-		}
-		else {
-			$rootpage=$params{page};
-		}
-		$formtemplate->param(rootpage => $rootpage);
+		$formtemplate->param(rootpage => rootpage(%params));
 		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
 		$formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
 		if (exists $params{postformtext}) {
@@ -653,4 +636,21 @@ sub pingurl (@) {
 	exit 0; # daemon done
 }
 
+
+sub rootpage (@) {
+	my %params=@_;
+
+	my $rootpage;
+	if (exists $params{rootpage}) {
+		$rootpage=bestlink($params{page}, $params{rootpage});
+		if (!length $rootpage) {
+			$rootpage=$params{rootpage};
+		}
+	}
+	else {
+		$rootpage=$params{page};
+	}
+	return $rootpage;
+}
+
 1