diff options
author | intrigeri <intrigeri@boum.org> | 2009-01-01 13:34:00 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-01-01 13:34:00 +0100 |
commit | 5c2f6cb8935f828274511ba5ca0d92b586632740 (patch) | |
tree | 0c72d1f73c0424236a98a1d51d192ee5e0e507ae /IkiWiki/Plugin/aggregate.pm | |
parent | c3af3840a295780e0f32df398f2dc7d34653e75e (diff) | |
parent | 8202cfe19e65867d7e41339944a8d7ca6daffa22 (diff) |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/aggregate.pm')
-rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 97dd036f6..c667ee2a9 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -4,7 +4,7 @@ package IkiWiki::Plugin::aggregate; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; use HTML::Parser; use HTML::Tagset; use HTML::Entities; @@ -46,7 +46,7 @@ sub getsetup () { }, aggregateinternal => { type => "boolean", - example => 0, + example => 1, description => "enable aggregation to internal pages?", safe => 0, # enabling needs manual transition rebuild => 0, @@ -61,6 +61,10 @@ sub getsetup () { } sub checkconfig () { + if (! defined $config{aggregateinternal}) { + $config{aggregateinternal}=1; + } + if ($config{aggregate} && ! ($config{post_commit} && IkiWiki::commit_hook_enabled())) { launchaggregation(); |