| 1 | --- program/include/main.inc.old 2006-12-13 11:34:34.145778629 +0100 |
|---|
| 2 | +++ program/include/main.inc 2006-12-13 11:33:47.674188351 +0100 |
|---|
| 3 | @@ -1575,11 +1575,11 @@ |
|---|
| 4 | |
|---|
| 5 | // get user's timezone |
|---|
| 6 | $tz = $CONFIG['timezone']; |
|---|
| 7 | - if ($CONFIG['dst_active']) |
|---|
| 8 | - $tz++; |
|---|
| 9 | |
|---|
| 10 | // convert time to user's timezone |
|---|
| 11 | $timestamp = $ts - date('Z', $ts) + ($tz * 3600); |
|---|
| 12 | + if ($CONFIG['dst_active'] && date("I", $timestamp) == "1") |
|---|
| 13 | + $timestamp += 3600; |
|---|
| 14 | |
|---|
| 15 | // get current timestamp in user's timezone |
|---|
| 16 | $now = time(); // local time |
|---|
