Calendar: Fix PHP 8 error "array_key_exists(): Argument #2 ($array) must be of type array, null given"

This commit is contained in:
nathan 2021-10-22 10:12:23 -06:00
parent e3526d2bef
commit 76e1e326f3

View File

@ -31,7 +31,6 @@ class calendar_wizard_import_ical
*/ */
function __construct() function __construct()
{ {
Api\Framework::includeJS('.','et2_widget_owner','calendar');
Api\Framework::includeCSS('calendar','calendar'); Api\Framework::includeCSS('calendar','calendar');
$this->steps = array( $this->steps = array(
'wizard_step55' => lang('Edit conditions'), 'wizard_step55' => lang('Edit conditions'),
@ -73,7 +72,7 @@ class calendar_wizard_import_ical
$content['step'] = 'wizard_step55'; $content['step'] = 'wizard_step55';
foreach(array('skip_conflicts','empty_before_import','remove_past','remove_future','override_values') as $field) foreach(array('skip_conflicts','empty_before_import','remove_past','remove_future','override_values') as $field)
{ {
if(!$content[$field] && array_key_exists($field, $content['plugin_options'])) if(!$content[$field] && is_array($content['plugin_options']) && array_key_exists($field, $content['plugin_options']))
{ {
$content[$field] = $content['plugin_options'][$field]; $content[$field] = $content['plugin_options'][$field];
} }