// Merge with revision 7841

This commit is contained in:
rMalie committed 2011-08-02 11:43:58 +00:00
1 parent 3c8c85b1cd
commit e2c8d89e41
130 files changed
+6620 -18585

No files matched your search

+1 -1
View File
@@ -983,7 +983,7 @@ class AdminImport extends AdminTab
{
$obj = new Attribute();
$obj->id_attribute_group = $groups[$group];
$obj->name[$defaultLanguage] = $attribute;
$obj->name[$defaultLanguage] = str_replace('\n', '', str_replace('\r', '', $attribute));
if (($fieldError = $obj->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $obj->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
{
$obj->add();