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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index e591df79f66b78e1d63e325e032c4e861f4502db..8135f9adb3d8071aedb30960952c803a3c95c310 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -28,7 +28,7 @@ sub refresh ($) { #{{{
        
        # delete old and excess changes
        foreach my $page (keys %pagesources) {
-               if ($page =~ /\._change$/ && ! $seen{$page}) {
+               if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {
                        unlink($config{srcdir}.'/'.$pagesources{$page});
                }
        }
@@ -161,10 +161,4 @@ sub store ($$$) { #{{{
        return $page;
 } #}}}
 
-sub updatechanges ($$) { #{{{
-       my $subdir=shift;
-       my @changes=@{shift()};
-       
-} #}}}
-
 1

diff --git a/debian/changelog b/debian/changelog
index 0a015182633bb95e02331cd7bf685c971e6f48d6..4218809314891ae992ceb36918271fd1c66f2df4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   * Several destpage fixes in plugins.
   * Use absolute url for feedurl when filling out the feed templates.
     Closes: #470530
+  * Fix expiry of old recentchanges changeset pages.
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100