[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.121.2.10,1.121.2.11

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        functions.inc.php 
Log Message:
Another possible fix for the calendar displaying 1970.

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.10
retrieving revision 1.121.2.11
diff -C2 -r1.121.2.10 -r1.121.2.11
*** functions.inc.php   6 Apr 2002 16:58:57 -0000       1.121.2.10
--- functions.inc.php   20 Jul 2002 13:22:20 -0000      1.121.2.11
***************
*** 704,708 ****
        $GLOBALS['phpgw']->preferences  = CreateObject('phpgwapi.preferences');
        $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
-       //      $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
        print_debug('main class loaded', 'messageonly','app');
        if (! 
isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) ||
--- 704,707 ----
***************
*** 744,747 ****
--- 743,747 ----
                                
$GLOBALS['phpgw']->accounts->accounts($login_id);
                                
$GLOBALS['phpgw']->preferences->preferences($login_id);
+                               $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetime');
                        }
                }
***************
*** 759,762 ****
--- 759,764 ----
                }
  
+               $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
+ 
                /* A few hacker resistant constants that will be used throught 
the program */
                define('PHPGW_TEMPLATE_DIR', 
ExecMethod('phpgwapi.phpgw.common.get_tpl_dir', 'phpgwapi'));
***************
*** 891,894 ****
--- 893,900 ----
                }
  
+               if(!is_object($GLOBALS['phpgw']->datetime))
+               {
+                       $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetime');
+               }
                
/*************************************************************************\
                * Load the header unless the developer turns it off             
          *