// Merge -> 10309

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -148,8 +148,7 @@ abstract class ObjectModelCore
 				$this->id = (int)($id);
 				foreach ($result AS $key => $value)
 					if (key_exists($key, $this))
-						// Todo: stripslashes() MUST BE removed in 1.4.6 and later, but is kept in 1.4.5 for a compatibility issue
-						$this->{$key} = stripslashes($value);
+						$this->{$key} = $value;

 				if (!$id_lang AND method_exists($this, 'getTranslationsFieldsChild'))
 				{