extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-11 07:50:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small patch to fix the lack of a locale being set in the users preferences.

Browse Source
This commit is contained in:
skeeter 2001-06-20 15:34:39 +00:00
parent 799ff3e90b
commit 0f204e662e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.calendar_holiday.inc.php
View File

@ -32,6 +32,10 @@ class calendar_holiday
{ {
$this->users['user'] = $phpgw_info['user']['preferences']['calendar']['locale']; $this->users['user'] = $phpgw_info['user']['preferences']['calendar']['locale'];
} }
else
{
$this->users['user'] = 'US';
}
$owner_id = get_account_id($owner); $owner_id = get_account_id($owner);
if($owner_id != $phpgw_info['user']['account_id']) if($owner_id != $phpgw_info['user']['account_id'])
{ {
@ -41,6 +45,11 @@ class calendar_holiday
{ {
$this->users['owner'] = $owner_prefs['calendar']['locale']; $this->users['owner'] = $owner_prefs['calendar']['locale'];
} }
else
{
$this->users['owner'] = 'US';
}
} }
if($phpgw_info['server']['auto_load_holidays'] == True) if($phpgw_info['server']['auto_load_holidays'] == True)
{ {

2
calendar/inc/class.holidaycalc.inc.php
View File

@ -15,7 +15,7 @@
if (empty($phpgw_info['user']['preferences']['calendar']['locale'])) if (empty($phpgw_info['user']['preferences']['calendar']['locale']))
{ {
$rule = 'EN'; $rule = 'US';
} }
else else
{ {