From 7aa859949b1dce842664bc6884677a6979ace5b2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Apr 2007 15:29:15 +0000 Subject: [PATCH] bugfix: calendar's default prefs where always in english, because quick_add selectbox is now part of the header and the header runs before the language gets read --> moved the call of bocal::check_set_default_prefs to the constructor of uical --- calendar/inc/class.bocal.inc.php | 1 - calendar/inc/class.uical.inc.php | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.bocal.inc.php b/calendar/inc/class.bocal.inc.php index 6de35994cc..89f87bff05 100644 --- a/calendar/inc/class.bocal.inc.php +++ b/calendar/inc/class.bocal.inc.php @@ -166,7 +166,6 @@ class bocal } $this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common']; $this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar']; - $this->check_set_default_prefs(); $this->tz_offset_s = $this->datetime->tz_offset; diff --git a/calendar/inc/class.uical.inc.php b/calendar/inc/class.uical.inc.php index d2c965624b..c94a04479c 100644 --- a/calendar/inc/class.uical.inc.php +++ b/calendar/inc/class.uical.inc.php @@ -156,6 +156,8 @@ class uical } $this->common_prefs = &$GLOBALS['egw_info']['user']['preferences']['common']; $this->cal_prefs = &$GLOBALS['egw_info']['user']['preferences']['calendar']; + $this->bo->check_set_default_prefs(); + $this->wd_start = 60*$this->cal_prefs['workdaystarts']; $this->wd_end = 60*$this->cal_prefs['workdayends']; $this->interval_m = $this->cal_prefs['interval'];