From 4fdefd61ae479b3ce4dd7e4c7c6eebbc4ae2c20a Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 13 Oct 2021 09:55:51 -0600 Subject: [PATCH] PHP 8.0: Avoid fatal error "array_key_exists(): Argument #2 ($array) must be of type array, null given" --- ...portexport_wizard_basic_export_csv.inc.php | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php index 68b6e5c8b8..a8b313941b 100644 --- a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php +++ b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php @@ -183,28 +183,37 @@ class importexport_wizard_basic_export_csv $content['step'] = 'wizard_step40'; // If editing an existing definition, these will be in plugin_options - if(!$content['delimiter'] && $content['plugin_options']['delimiter']) { + if(!$content['delimiter'] && $content['plugin_options']['delimiter']) + { $content['delimiter'] = $content['plugin_options']['delimiter']; - } elseif (!$content['delimiter']) { + } + elseif(!$content['delimiter']) + { $content['delimiter'] = ';'; } - if(!$content['charset'] && $content['plugin_options']['charset']) { + if(!$content['charset'] && $content['plugin_options']['charset']) + { $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user'; } - if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) { + if(!array_key_exists('begin_with_fieldnames', $content) && + is_array($content['plugin_options']) && + array_key_exists('begin_with_fieldnames', $content['plugin_options'])) + { $content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames']; } - if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) { + if(!array_key_exists('convert', $content) && + is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) + { $content['convert'] = $content['plugin_options']['convert']; } $sel_options['begin_with_fieldnames'] = array( - 0 => lang('No'), - 1 => lang('Field names'), - 'label' => lang('Field labels') + 0 => lang('No'), + 1 => lang('Field names'), + 'label' => lang('Field labels') ); - $sel_options['charset'] = Api\Translation::get_installed_charsets()+ + $sel_options['charset'] = Api\Translation::get_installed_charsets() + array( 'user' => lang('User preference'), );