Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Removed warning when foreign key table is empty

Browse Source
This commit is contained in:
Laurent Destailleur
2011-06-17 21:24:47 +00:00
parent 9a6cafdf18
commit d97109f53b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/modules/import/import_csv.modules.php
View File

@@ -374,8 +374,8 @@ class ImportCsv extends ModeleImports
} }
} }
// Now we check in cache // Now we check cache is not empty (should not) and key is into cache
if (! in_array($newval,$this->cachefieldtable[$field.'@'.$table])) if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
{ {
$this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,$field,$table); $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,$field,$table);
$this->errors[$error]['type']='FOREIGNKEY'; $this->errors[$error]['type']='FOREIGNKEY';
@@ -463,7 +463,7 @@ class ImportCsv extends ModeleImports
/** /**
* Clean a string from separator * Clean a string from separator
*/ */
function cleansep($value) function cleansep($value)
{ {
return str_replace(',','/',$value); return str_replace(',','/',$value);
}; };