holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use "none" instead of "0" to allow default or forced pref

Browse Source
This commit is contained in:
Ralf Becker 2018-04-10 14:02:38 +02:00
parent e72c7c76b6
commit 4323a40aad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_hooks.inc.php
View File

@ -162,7 +162,7 @@ class calendar_hooks
'Saturday' => lang('Saturday') 'Saturday' => lang('Saturday')
); );
$birthdays_as_events = array( $birthdays_as_events = array(
'0' => lang('None'), 'none' => lang('None'),
'birthday' => lang('Birthdays'), 'birthday' => lang('Birthdays'),
'holiday' => lang('Holidays') 'holiday' => lang('Holidays')
); );
@ -325,7 +325,7 @@ class calendar_hooks
'label' => 'Show birthdays as events', 'label' => 'Show birthdays as events',
'name' => 'birthdays_as_events', 'name' => 'birthdays_as_events',
'help' => 'Show birthdays as all day non-blocking events as well as via mouseover of the date.', 'help' => 'Show birthdays as all day non-blocking events as well as via mouseover of the date.',
'default'=> '0' 'default'=> 'none'
), ),
'limit_all_day_lines' => array( 'limit_all_day_lines' => array(
'type' => 'input', 'type' => 'input',

2
calendar/setup/tables_update.inc.php
View File

@ -2759,7 +2759,7 @@ function calendar_upgrade17_1()
{ {
// Update birthdays as events preference from boolean // Update birthdays as events preference from boolean
$change = function($attr, $old_value, $owner) { $change = function($attr, $old_value, $owner) {
return $old_value ? 'birthday' : '0'; return $old_value ? 'birthday' : 'none';
}; };
Api\Preferences::change_preference('calendar', 'birthdays_as_events', $change); Api\Preferences::change_preference('calendar', 'birthdays_as_events', $change);
return $GLOBALS['setup_info']['calendar']['currentver'] = '17.1.001'; return $GLOBALS['setup_info']['calendar']['currentver'] = '17.1.001';