From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 00:04:29 +0000 (+0100)
Subject: Use _aggregated as extension for internalized aggregation
X-Git-Tag: 2.54~95^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=302bb836f298c462da8e8bff7b04f1b00ded4665;p=ikiwiki.git

Use _aggregated as extension for internalized aggregation
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9da619375..e93492863 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 	hook(type => "preprocess", id => "aggregate", call => \&preprocess);
         hook(type => "delete", id => "aggregate", call => \&delete);
 	hook(type => "savestate", id => "aggregate", call => \&savestate);
+	hook(type => "htmlize", id => "_aggregated", call => \&htmlize);
 	if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
 		hook(type => "cgi", id => "aggregate", call => \&cgi);
 	}
@@ -113,6 +114,12 @@ sub launchaggregation () { #{{{
 	return 1;
 } #}}}
 
+#  Pages with extension _aggregated have plain html markup, pass through.
+sub htmlize (@) { #{{{
+	my %params=@_;
+	return $params{content};
+} #}}}
+
 sub migrate_to_internal { #{{{
 
 	if (! lockaggregate()) {
@@ -641,7 +648,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+	return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
 } #}}}
 
 my $aggregatelock;