From: Simon McVittie <smcv@carbon.pseudorandom.co.uk>
Date: Mon, 14 Jul 2008 21:22:39 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 2.54~87^2~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a65d312467c5ab179ecf4aa715790f371a46634a?hp=-c

Merge branch 'master' of git://git.ikiwiki.info
---

a65d312467c5ab179ecf4aa715790f371a46634a
diff --combined IkiWiki/Plugin/aggregate.pm
index 4fbcde390,f61804237..b3d4a5eec
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@@ -30,10 -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 () { #{{{
@@@ -134,7 -131,7 +134,7 @@@ sub preprocess (@) { #{{
  
  	foreach my $required (qw{name url}) {
  		if (! exists $params{$required}) {
- 			return "[[aggregate ".sprintf(gettext("missing %s parameter"), $required)."]]";
+ 			error sprintf(gettext("missing %s parameter"), $required)
  		}
  	}
  
@@@ -598,7 -595,7 +598,7 @@@ sub pagefile ($) { #{{
  } #}}}
  
  sub htmlfn ($) { #{{{
 -	return shift().".".$config{htmlext};
 +	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
  } #}}}
  
  my $aggregatelock;