|
From: Sven <bra...@us...> - 2005-01-08 11:56:32
|
Update of /cvsroot/osbb/osbb/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27881/lib Modified Files: functions.inc.php Log Message: And another DST bugfix -.- Index: functions.inc.php =================================================================== RCS file: /cvsroot/osbb/osbb/lib/functions.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** functions.inc.php 7 Jan 2005 12:14:47 -0000 1.19 --- functions.inc.php 8 Jan 2005 11:56:23 -0000 1.20 *************** *** 477,486 **** if(empty($userdata['userdateformat'])) $userdata['userdateformat'] = $config['dateformat']; if(empty($userdata['usertimeformat'])) $userdata['usertimeformat'] = $config['timeformat']; ! $timezone = 3600*(intval($userdata['usertimezone'])+date("I")); ! $time = $time+$timezone; ! $time2 = time()+$timezone; if($showdate == 1) $date = formatDate2($userdata['userdateformat'],$time,$time2); else $date = ''; ! if($showtime == 1) $time = formatTime($userdata['usertimeformat'],$time,$timezone); else $time = ''; if($showtime == 1 && $showdate == 0) return $time; --- 477,485 ---- if(empty($userdata['userdateformat'])) $userdata['userdateformat'] = $config['dateformat']; if(empty($userdata['usertimeformat'])) $userdata['usertimeformat'] = $config['timeformat']; ! $time = $time+3600*(intval($userdata['usertimezone'])+date('I',$time)); ! $time2 = time()+3600*(intval($userdata['usertimezone'])+date('I')); if($showdate == 1) $date = formatDate2($userdata['userdateformat'],$time,$time2); else $date = ''; ! if($showtime == 1) $time = formatTime($userdata['usertimeformat'],$time,(3600*(intval($userdata['usertimezone'])+date('I',$time)))); else $time = ''; if($showtime == 1 && $showdate == 0) return $time; |