diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -7,6 +7,10 @@ ikiwiki (3.20180312) UNRELEASED; urgency=medium [ Simon McVittie ] * Hide popup template content from documentation (Closes: #898836) + [ Joey Hess ] + * aggregate: Fix aggregation of posts without a title. + Thanks, Alexandre Oliva + -- Simon McVittie <smcv@debian.org> Wed, 16 May 2018 13:09:27 +0100 ikiwiki (3.20180311) upstream; urgency=medium diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index be7da3a71..05e22a290 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -621,11 +621,11 @@ sub add_page (@) { # escape slashes and periods in title so it doesn't specify # directory name or trigger ".." disallowing code. $page=~s!([/.])!"__".ord($1)."__"!eg; - $page=$feed->{dir}."/".$page; - ($page)=$page=~/$config{wiki_file_regexp}/; if (! defined $page || ! length $page) { $page=$feed->{dir}."/item"; } + $page=$feed->{dir}."/".$page; + ($page)=$page=~/$config{wiki_file_regexp}/; my $c=""; while (exists $IkiWiki::pagecase{lc $page.$c} || -e $IkiWiki::Plugin::transient::transientdir."/".htmlfn($page.$c) || |