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 error shown after importing ical

Browse Source 
"substr(): Argument #1 ($string) must be of type string, array given"
This commit is contained in:
nathan 2023-04-14 10:45:19 -06:00
parent 43873af7bc
commit ba46b48206
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,12 +298,18 @@ class calendar_import_ical implements importexport_iface_import_plugin {
*/ */
public function get_options_etpl(importexport_definition &$definition=null) public function get_options_etpl(importexport_definition &$definition=null)
{ {
$owner = $definition->plugin_options['owner'] ?? $GLOBALS['egw_info']['user']['account_id'];
// Make sure Owner from import dialog is not array
if(is_array($owner))
{
$owner = array_pop($owner);
}
return array( return array(
'name' => 'calendar.import_ical', 'name' => 'calendar.import_ical',
'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' => $owner ? [$owner] : null
), ),
'sel_options' => array( 'sel_options' => array(
'charset' => Api\Translation::get_installed_charsets(), 'charset' => Api\Translation::get_installed_charsets(),