X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/df30eda283e4fdb6945508e17ca48ae21528596c..1aac0b5a60b8445422f44325870cbf6c28c57196:/IkiWiki/Plugin/aggregate.pm?ds=inline diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 23428cb0e..4bc919526 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++ } @@ -323,7 +323,7 @@ sub htmlabs ($$) { #{{{ # Convert links in html from relative to absolute. # Note that this is a heuristic, which is not specified by the rss # spec and may not be right for all feeds. Also, see Debian - # bug #XXXX TODO: get bug. + # bug #381359. my $html=shift; my $urlbase=shift;