From: Simon McVittie <smcv@carbon.pseudorandom.co.uk>
Date: Mon, 14 Jul 2008 22:34:07 +0000 (+0100)
Subject: Merge commit 'origin/master' into aggregateinternal
X-Git-Tag: 2.54~99
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/18b3e970ffcc0f74d68538b7094f76442a294609?hp=66053f6fc7b300c9b49a5c69d2c7a1eeec841743

Merge commit 'origin/master' into aggregateinternal
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index f61804237..b3d4a5eec 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -30,7 +30,10 @@ sub getopt () { #{{{
         eval q{use Getopt::Long};
 	error($@) if $@;
         Getopt::Long::Configure('pass_through');
-        GetOptions("aggregate" => \$config{aggregate});
+        GetOptions(
+		"aggregate" => \$config{aggregate},
+		"aggregateinternal!" => \$config{aggregateinternal},
+	);
 } #}}}
 
 sub checkconfig () { #{{{
@@ -595,7 +598,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".".$config{htmlext};
+	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
 } #}}}
 
 my $aggregatelock;