Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index e473fc6430819bbb19a0120d0acca4106b25edc7..fe53d868dbad39d455f59b45c91af54b4ee156cd 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -210,6 +210,8 @@ sub needsbuild (@) {
                        markunseen($feed->{sourcepage});
                }
        }
+
+       return $needsbuild;
 }
 
 sub preprocess (@) {
@@ -359,14 +361,9 @@ sub savestate () {
 
        my $timestamp=undef;
        foreach my $feed (keys %feeds) {
-               if (defined $feeds{$feed}->{lastupdate}) {
-                       my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
-                       if (! defined $timestamp || $timestamp > $t) {
-                               $timestamp=$t;
-                       }
-               }
-               else {
-                       $timestamp=0;
+               my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
+               if (! defined $timestamp || $timestamp > $t) {
+                       $timestamp=$t;
                }
        }
        $newfile=~s/\.new$/time/;