aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-12-28 20:02:22 -0400
committerJoey Hess <joey@kitenet.net>2013-12-28 20:02:22 -0400
commita2fb23286fee47875f8d7d261b4c9b6a5fb3606a (patch)
tree8810d12f913f92f25af4d56334b39594b92fdf1f /IkiWiki/Plugin
parent68e266e0425bea4087a87fa541650ba2789012b5 (diff)
downloadikiwiki-a2fb23286fee47875f8d7d261b4c9b6a5fb3606a.tar
ikiwiki-a2fb23286fee47875f8d7d261b4c9b6a5fb3606a.tar.gz
aggregrate: Fix several bugs in handling of empty and colliding titles when generating filenames.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/aggregate.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 3e3eb6d93..28c445913 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -628,12 +628,12 @@ sub add_page (@) {
-e "$config{srcdir}/".htmlfn($page.$c)) {
$c++
}
+ $page=$page.$c;
$guid->{page}=$page;
eval { write_page($feed, $guid, $mtime, \%params) };
if ($@) {
# assume failure was due to a too long filename
- # (or o
$c="";
$page=$feed->{dir}."/item";
while (exists $IkiWiki::pagecase{lc $page.$c} ||
@@ -641,6 +641,7 @@ sub add_page (@) {
-e "$config{srcdir}/".htmlfn($page.$c)) {
$c++
}
+ $page=$page.$c;
$guid->{page}=$page;
write_page($feed, $guid, $mtime, \%params);