urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use _aggregated as extension for internalized aggregation

master
Simon McVittie 2008-07-15 01:04:29 +01:00
parent e54af6e0a5
commit 302bb836f2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/aggregate.pm
View 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};
} #}}}
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;