From 34fdf4ec696c1d6d644eaef11d858f92fce00e93 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 5 Nov 2012 15:54:34 +0000
Subject: [PATCH] [-] CORE : fixed bug #PSCFV-5190 - ObjectModel
 setDefinitionRetrocompatibility faulty

---
 classes/ObjectModel.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index fc3ee68fb..30bdb49f1 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1473,13 +1473,19 @@ abstract class ObjectModelCore
 		else
 		{
 			$this->def['fields'] = array();
-			$suffix = (isset($data['lang']) && $data['lang']) ? 'Lang' : '';
-			foreach ($this->{'fieldsValidate'.$suffix} as $field => $validate)
-				$this->def['fields'][$field]['validate'] = $validate;
-			foreach ($this->{'fieldsRequired'.$suffix} as $field)
-				$this->def['fields'][$field]['required'] = true;
-			foreach ($this->{'fieldsSize'.$suffix} as $field => $size)
-				$this->def['fields'][$field]['size'] = $size;
+			$suffixs = array('', 'Lang');
+			foreach($suffixs as $suffix)
+			{
+				foreach ($this->{'fieldsValidate'.$suffix} as $field => $validate)
+					$this->def['fields'][$field]['validate'] = $validate;
+				
+				foreach ($this->{'fieldsRequired'.$suffix} as $field)
+					$this->def['fields'][$field]['required'] = true;
+				
+				foreach ($this->{'fieldsSize'.$suffix} as $field => $size)
+					$this->def['fields'][$field]['size'] = $size;
+
+			}
 		}
 	}