extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix bug in iCal import that gave bad calendar owner value

Browse Source
This commit is contained in:
nathan 2023-02-06 16:23:39 -07:00
parent 2c15e2f8ef
commit 95a4b319bb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,7 +303,7 @@ class calendar_import_ical implements importexport_iface_import_plugin {
'content' => array( 'content' => array(
'file_type' => 'ical', 'file_type' => 'ical',
'charset' => $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'], 'charset' => $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'],
'cal_owner' => $definition->plugin_options['cal_owner'] ?? $GLOBALS['egw_info']['user']['account_id'] 'cal_owner' => $definition->plugin_options['cal_owner'] ?: $GLOBALS['egw_info']['user']['account_id']
), ),
'sel_options' => array( 'sel_options' => array(
'charset' => Api\Translation::get_installed_charsets() 'charset' => Api\Translation::get_installed_charsets()

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

@ -281,6 +281,11 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
*/ */
protected static function format_owner($id, $title, $data = array()) protected static function format_owner($id, $title, $data = array())
{ {
if(!$id)
{
return "";
}
static $contacts_obj = null; static $contacts_obj = null;
if(is_null($contacts_obj)) if(is_null($contacts_obj))
{ {