extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small code cleanups.

Browse Source
This commit is contained in:
skeeter 2001-12-10 03:55:47 +00:00
parent c9c6cd8340
commit a8f3f17a36
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.boholiday.inc.php
View File

@ -62,7 +62,7 @@
if($this->debug) if($this->debug)
{ {
echo "Locale = ".$this->locales[0]."<br>\n"; echo '<-- Locale = '.$this->locales[0].' -->'."\n";
} }
$this->total = $this->so->holiday_total($this->locales[0],$this->query); $this->total = $this->so->holiday_total($this->locales[0],$this->query);
@ -173,7 +173,8 @@
function prepare_read_holidays($year=0,$owner=0) function prepare_read_holidays($year=0,$owner=0)
{ {
$this->year = ($year?$year:$GLOBALS['phpgw']->common->show_date(time(),'Y')); $datetime = CreateObject('phpgwapi.datetime');
$this->year = ($year?$year:$GLOBALS['phpgw']->common->show_date(time() - $datetime->tz_offset,'Y'));
$this->owner = ($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']); $this->owner = ($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']);
if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country']) if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])