Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 3d10b1e2ec5f1f61c37370ad635f4f36c173bb6a..45617afe82d9af5b8ce8c4632df02e8a6c827580 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -115,7 +115,7 @@ sub build_affected {
                $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
                ($ayear, $valid) = previousyear($year, $config{archivebase});
                $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
                $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
                ($ayear, $valid) = previousyear($year, $config{archivebase});
                $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);

-               foreach my $month (keys $changed{$year}) {
+               foreach my $month (keys %{$changed{$year}}) {

                        ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase});
                        $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
                        ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase});
                        ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase});
                        $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
                        ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase});


@@ -141,7 +141,9 @@ sub autocreate {
        $template->param(month => $month) if defined $month;
        $template->param(pagespec => $config{archive_pagespec});
 
        $template->param(month => $month) if defined $month;
        $template->param(pagespec => $config{archive_pagespec});
 

+       no warnings 'once';

        my $dir = $IkiWiki::Plugin::transient::transientdir;
        my $dir = $IkiWiki::Plugin::transient::transientdir;

+       use warnings;

 
        writefile($pagefile, $dir, $template->output);
 }
 
        writefile($pagefile, $dir, $template->output);
 }


@@ -221,6 +223,10 @@ sub previousmonth($$$) {
        my $month = shift;
        my $archivebase = shift;
 
        my $month = shift;
        my $archivebase = shift;
 

+       if (not exists $wikistate{calendar}{minyear}) {
+               $wikistate{calendar}{minyear} = $year;
+       }
+

        my $pmonth = $month;
        my $pyear  = $year;
        while ((not exists $pagesources{"$archivebase/$pyear/" . sprintf("%02d", $pmonth)}) or ($pmonth == $month and $pyear == $year)) {
        my $pmonth = $month;
        my $pyear  = $year;
        while ((not exists $pagesources{"$archivebase/$pyear/" . sprintf("%02d", $pmonth)}) or ($pmonth == $month and $pyear == $year)) {


@@ -239,6 +245,10 @@ sub nextmonth($$$) {
        my $month = shift;
        my $archivebase = shift;
 
        my $month = shift;
        my $archivebase = shift;
 

+       if (not exists $wikistate{calendar}{maxyear}) {
+               $wikistate{calendar}{maxyear} = $year;
+       }
+

        my $nmonth = $month;
        my $nyear  = $year;
        while ((not exists $pagesources{"$archivebase/$nyear/" . sprintf("%02d", $nmonth)}) or ($nmonth == $month and $nyear == $year)) {
        my $nmonth = $month;
        my $nyear  = $year;
        while ((not exists $pagesources{"$archivebase/$nyear/" . sprintf("%02d", $nmonth)}) or ($nmonth == $month and $nyear == $year)) {