mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:29 +01:00
importexport: Avoid error or infinite loop for really badly parsed select values
This commit is contained in:
parent
8e0192fb7c
commit
580ff870e6
@ -538,10 +538,13 @@ class importexport_import_csv implements importexport_iface_import_record { //,
|
||||
for($sub_index = 0; $sub_index < count($subs); $sub_index++)
|
||||
{
|
||||
$sub_key = static::find_select_key(trim($subs[$sub_index]), $selects);
|
||||
if(!$sub_key)
|
||||
if(!$sub_key && array_key_exists($sub_index + 1, $subs))
|
||||
{
|
||||
$sub_key = static::find_select_key(trim($subs[$sub_index]).','.trim($subs[$sub_index+1]), $selects);
|
||||
if($sub_key) $sub_index++;
|
||||
$sub_key = static::find_select_key(trim($subs[$sub_index]) . ',' . trim($subs[$sub_index + 1]), $selects);
|
||||
if($sub_key)
|
||||
{
|
||||
$sub_index++;
|
||||
}
|
||||
}
|
||||
if($sub_key)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user