X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a1c7308b7d26915956d938808bbb05c194d60a45..1aac0b5a60b8445422f44325870cbf6c28c57196:/IkiWiki/Plugin/aggregate.pm
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 41c25fe26..4bc919526 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,12 +35,14 @@ sub getopt () { #{{{
} #}}}
sub checkconfig () { #{{{
+ IkiWiki::lockwiki();
loadstate();
if ($IkiWiki::config{aggregate}) {
IkiWiki::loadindex();
aggregate();
savestate();
}
+ IkiWiki::unlockwiki();
} #}}}
sub filter (@) { #{{{
@@ -98,7 +100,7 @@ sub preprocess (@) { #{{{
return "{url}."\">".$feed->{name}.": ".
"".$feed->{message}." (".$feed->{numposts}.
- " stored posts; ".$feed->{newposts}." new)
";
+ " stored posts; ".$feed->{newposts}." new)";
} # }}}
sub delete (@) { #{{{
@@ -260,13 +262,12 @@ sub add_page (@) { #{{{
# directory name or trigger ".." disallowing code.
$page=~s!([/.])!"__".ord($1)."__"!eg;
$page=$feed->{dir}."/".$page;
- $page=lc($page);
($page)=$page=~/$IkiWiki::config{wiki_file_regexp}/;
if (! defined $page || ! length $page) {
$page=$feed->{dir}."/item";
}
my $c="";
- while (exists $IkiWiki::pagesources{$page.$c} ||
+ while (exists $IkiWiki::pagecase{lc $page.$c} ||
-e pagefile($page.$c)) {
$c++
}
@@ -322,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;