(no commit message)

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

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 9639f6d08ea360fcf0d1865bb8277beb69dfb167..23246757bacbd6d7dad04fbc031044f090555fcb 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl

 # Copyright (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify


@@ -171,8 +171,6 @@ sub gencalendaryear {
        my $year = shift;
        my %params = @_;
 
        my $year = shift;
        my %params = @_;
 

-       return unless $config{calendar_autocreate};
-

        # Building year page
        my $page = calendarlink($year);
        my $pagefile = newpagefile($page, $config{default_pageext});
        # Building year page
        my $page = calendarlink($year);
        my $pagefile = newpagefile($page, $config{default_pageext});


@@ -195,7 +193,7 @@ sub gencalendaryear {
                }
 
                # Filling potential gaps in years (e.g. calendar goes from 2010 to 2014,
                }
 
                # Filling potential gaps in years (e.g. calendar goes from 2010 to 2014,

-               # and we just added year 2005. We have to had years 2006 to 2009).
+               # and we just added year 2005. We have to add years 2006 to 2009).

                return if $params{norecurse};
                if ($wikistate{calendar}{minyear} > $year) {
                        foreach my $other ($year + 1 .. $wikistate{calendar}{minyear} - 1) {
                return if $params{norecurse};
                if ($wikistate{calendar}{minyear} > $year) {
                        foreach my $other ($year + 1 .. $wikistate{calendar}{minyear} - 1) {


@@ -223,6 +221,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)) {


@@ -241,6 +243,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)) {


@@ -713,6 +719,8 @@ sub scan (@) {
        my %params=@_;
        my $page=$params{page};
 
        my %params=@_;
        my $page=$params{page};
 

+       return unless $config{calendar_autocreate};
+

        # Check if year pages have to be generated
        if (pagespec_match($page, $config{archive_pagespec})) {
                my @ctime = localtime($IkiWiki::pagectime{$page});
        # Check if year pages have to be generated
        if (pagespec_match($page, $config{archive_pagespec})) {
                my @ctime = localtime($IkiWiki::pagectime{$page});