X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/df30eda283e4fdb6945508e17ca48ae21528596c..6fc3b624f209f71335bed9947eda956e7d118458:/IkiWiki/Plugin/aggregate.pm?ds=inline diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 23428cb0e..33d7174f5 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -35,14 +35,14 @@ sub getopt () { #{{{ } #}}} sub checkconfig () { #{{{ + IkiWiki::lockwiki(); + loadstate(); if ($IkiWiki::config{aggregate}) { - IkiWiki::lockwiki(); - loadstate(); IkiWiki::loadindex(); aggregate(); savestate(); - IkiWiki::unlockwiki(); } + IkiWiki::unlockwiki(); } #}}} sub filter (@) { #{{{ @@ -267,7 +267,7 @@ sub add_page (@) { #{{{ $page=$feed->{dir}."/item"; } my $c=""; - while (exists $IkiWiki::pagecase{lc $page} || + while (exists $IkiWiki::pagecase{lc $page.$c} || -e pagefile($page.$c)) { $c++ }