From fd272c934370fede6780b439e75348a42097848b Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Mon, 13 Nov 2000 14:50:44 +0100
Subject: [PATCH] bugfix
Rev: lib/modules/Calendar.pmod/Event.pmod:1.11
---
lib/modules/Calendar.pmod/Event.pmod | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/modules/Calendar.pmod/Event.pmod b/lib/modules/Calendar.pmod/Event.pmod
index 027b854f67..101aeedaf5 100644
--- a/lib/modules/Calendar.pmod/Event.pmod
+++ b/lib/modules/Calendar.pmod/Event.pmod
@@ -1318,7 +1318,7 @@ class TZShift_Event
TimeRange btr=0;
if (nextshift!=-1)
- btr=from->calendar()->Second("unix",nextshift);
+ btr=from->calendar()->Second("unix_r",nextshift,from->ruleset());
TimeRange atr=from;
for (;;)
@@ -1371,7 +1371,8 @@ class TZShift_Event
if (shift[0]>=jd)
{
TimeRange atr=from->calendar()
- ->Second("unix",(shift[0]-2440588)*86400+shift[1]);
+ ->Second("unix_r",(shift[0]-2440588)*86400+shift[1],
+ from->ruleset());
if (atr>=from) return atr;
}
}
@@ -1381,7 +1382,8 @@ class TZShift_Event
if (shift[0]<=jd)
{
TimeRange atr=from->calendar()
- ->Second("unix",(shift[0]-2440588)*86400+shift[1]);
+ ->Second("unix_r",(shift[0]-2440588)*86400+shift[1],
+ from->ruleset());
if (atr<=from) return atr;
}
}
--
GitLab