summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-07-15 01:04:29 +0100
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-07-15 01:04:29 +0100
commit302bb836f298c462da8e8bff7b04f1b00ded4665 (patch)
treeae4b25923b37a11290d2c28eae292635f7e4ce51
parente54af6e0a5e9e45a1e88d7b6aac4283e974d0258 (diff)
Use _aggregated as extension for internalized aggregation
-rw-r--r--IkiWiki/Plugin/aggregate.pm9
1 files changed, 8 insertions, 1 deletions
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;