mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
GNU Bug #631.
This commit is contained in:
parent
058ddb033f
commit
45978168e2
@ -1622,17 +1622,18 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
|
||||
*/
|
||||
function show_date($t = '', $format = '')
|
||||
{
|
||||
if (!$t)
|
||||
if(!is_object($GLOBALS['phpgw']->datetime))
|
||||
{
|
||||
$GLOBALS['phpgw']->datetime = createobject('phpgwapi.datetime');
|
||||
}
|
||||
|
||||
if (!$t || intval($t) <= 0)
|
||||
{
|
||||
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']));
|
||||
$t += $GLOBALS['phpgw']->datetime->tz_offset;
|
||||
|
||||
if (! $format)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user