X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/264a82a435b9ce5560f4bbea7b53270c53ef5720..87bee5abb6f4b367133f5c4dfd1701a691a36a0a:/IkiWiki/Plugin/inline.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ebeb23178..59eabb606 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -14,7 +14,7 @@ my %page_numfeeds;
 sub import { #{{{
 	hook(type => "getopt", id => "inline", call => \&getopt);
 	hook(type => "checkconfig", id => "inline", call => \&checkconfig);
-	hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+	hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
 	hook(type => "preprocess", id => "inline", 
 		call => \&IkiWiki::preprocess_inline);
 	hook(type => "pagetemplate", id => "inline",
@@ -152,7 +152,12 @@ sub preprocess_inline (@) { #{{{
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
 	add_depends($params{page}, join(" or ", @list));
-	
+	# Force a scan of this page so any metadata that appears after this
+	# inline directive is available when inlining. The page normally 
+	# wouldn't be scanned if it's only being rebuilt because of a
+	# depedency.
+	IkiWiki::scan($pagesources{$params{page}});
+
 	my $feednum="";
 
 	my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
@@ -161,16 +166,20 @@ sub preprocess_inline (@) { #{{{
 	}
 	else {
 		if (exists $page_numfeeds{$params{destpage}}) {
-			$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			if ($feeds) {
+				$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			}
 		}
 		else {
 			$feednum=$knownfeeds{$feedid}="";
-			$page_numfeeds{$params{destpage}}=1;
+			if ($feeds) {
+				$page_numfeeds{$params{destpage}}=1;
+			}
 		}
 	}
 
-	my $rssurl=basename(rsspage($params{destpage}).$feednum);
-	my $atomurl=basename(atompage($params{destpage}).$feednum);
+	my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+	my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
 	my $ret="";
 
 	if ($config{cgiurl} && (exists $params{rootpage} ||