mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-01 04:13:28 +01:00
fix explode(): Argument #2 ($string) must be of type string, array given
This commit is contained in:
parent
6bafc579f0
commit
0ae7f21fa1
@ -241,7 +241,8 @@ class importexport_wizard_basic_import_csv
|
||||
|
||||
// Add in extra allowed charsets
|
||||
$config = Api\Config::read('importexport');
|
||||
$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
|
||||
$extra_charsets = is_array($config['import_charsets']) ? $config['import_charsets'] : explode(',',$config['import_charsets']);
|
||||
$extra_charsets = array_intersect($extra_charsets, mb_list_encodings());
|
||||
if($extra_charsets)
|
||||
{
|
||||
$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
|
||||
|
Loading…
Reference in New Issue
Block a user