// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
@@ -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();