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

diff --combined IkiWiki/Plugin/aggregate.pm
index 4fbcde390d59fd232f9fbfaf63f358259f74b423,f618042374acc4e561be7be446b4fd0c918db316..b3d4a5eec84d5a46f5b8b3c485cd0d73430c62a2
--- 1/IkiWiki/Plugin/aggregate.pm
--- 2/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;