[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.149,1.150
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.149,1.150 |
Date: |
Mon, 24 Jun 2002 21:38:36 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18465/phpgwapi/inc
Modified Files:
class.common.inc.php
Log Message:
GNU Bug #631.
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -r1.149 -r1.150
*** class.common.inc.php 9 Jun 2002 02:17:37 -0000 1.149
--- class.common.inc.php 25 Jun 2002 01:38:34 -0000 1.150
***************
*** 1623,1637 ****
function show_date($t = '', $format = '')
{
! if (!$t)
{
- if(!is_object($GLOBALS['phpgw']->datetime))
- {
- $GLOBALS['phpgw']->datetime =
createobject('phpgwapi.datetime');
- }
$t = $GLOBALS['phpgw']->datetime->gmtnow;
}
// + (date('I') == 1?3600:0)
! $t += (3600 *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
if (! $format)
--- 1623,1638 ----
function show_date($t = '', $format = '')
{
! if(!is_object($GLOBALS['phpgw']->datetime))
! {
! $GLOBALS['phpgw']->datetime =
createobject('phpgwapi.datetime');
! }
!
! if (!$t || intval($t) <= 0)
{
$t = $GLOBALS['phpgw']->datetime->gmtnow;
}
// + (date('I') == 1?3600:0)
! $t += $GLOBALS['phpgw']->datetime->tz_offset;
if (! $format)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.149,1.150,
Mark A Peters <address@hidden> <=