From 0ab3a209cc1aaca8dc6aafd2ad9cbfa02cf4a209 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 7 Mar 2018 14:06:02 -0700 Subject: [PATCH] Calendar - fix birthday preference always sent to client as false --- calendar/inc/class.calendar_hooks.inc.php | 4 ++-- calendar/js/et2_widget_daycol.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index f6c10d6917..705173270a 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -162,7 +162,7 @@ class calendar_hooks 'Saturday' => lang('Saturday') ); $birthdays_as_events = array( - 0 => lang('None'), + '0' => lang('None'), 'birthday' => lang('Birthdays'), 'holiday' => lang('Holidays') ); @@ -325,7 +325,7 @@ class calendar_hooks 'label' => 'Show birthdays as events', 'name' => 'birthdays_as_events', 'help' => 'Show birthdays as all day non-blocking events as well as via mouseover of the date.', - 'default'=> FALSE + 'default'=> '0' ), 'limit_all_day_lines' => array( 'type' => 'input', diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index 4aa2b8bd49..2846de6821 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -417,7 +417,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte var holidays = et2_calendar_view.get_holidays(this,this.options.date.substring(0,4)); var holiday_list = []; var holiday_pref = (egw.preference('birthdays_as_events','calendar')||'').split(','); -debugger; + // Show holidays as events on mobile or by preference var holidays_as_events = egwIsMobile() || egw.preference('birthdays_as_events','calendar') === true || holiday_pref.indexOf('holiday') >= 0;