aggregrate: Fix several bugs in handling of empty and colliding titles when generating filenames.
parent
68e266e042
commit
a2fb23286f
|
@ -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);
|
||||
|
|
|
@ -20,6 +20,8 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
|
|||
Closes: #731197
|
||||
* style.css: Add compatability definitions for more block-level
|
||||
html5 elements. Closes: #731199
|
||||
* aggregrate: Fix several bugs in handling of empty and colliding
|
||||
titles when generating filenames.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400
|
||||
|
||||
|
|
Loading…
Reference in New Issue