[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.2,1.123.2.3

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18459/phpgwapi/inc

Modified Files:
      Tag: Version-0_9_14-branch
        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.123.2.2
retrieving revision 1.123.2.3
diff -C2 -r1.123.2.2 -r1.123.2.3
*** class.common.inc.php        9 Jun 2002 02:16:29 -0000       1.123.2.2
--- class.common.inc.php        25 Jun 2002 01:38:32 -0000      1.123.2.3
***************
*** 1210,1224 ****
                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)
--- 1210,1225 ----
                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)