]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/aggregate.pm
Merge commit 'smcv/aggregateinternal' into aggregateinternal
[ikiwiki.git] / IkiWiki / Plugin / aggregate.pm
index 1f09c988b8ab8bdf05bd6ba2cad4bf787d904a42..2fcdec9e73d71ad303ff4f807d8f81a9bcc58248 100644 (file)
@@ -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};
+} #}}}
+
 # Used by ikiwiki-transition aggregateinternal.
 sub migrate_to_internal { #{{{
        if (! lockaggregate()) {
@@ -640,7 +647,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-       return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+       return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
 } #}}}
 
 my $aggregatelock;