Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

2013-09-30 16:13:15 +00:00
parent 67d0ac95b5 7d764c5ce8
commit f39c2c40cf
4 changed files with 46 additions and 26 deletions
@@ -1187,7 +1187,7 @@ class WebserviceRequestCore
 				else
 				{
 					$object = new $this->resourceConfiguration['retrieveData']['className']();
-					if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']))
+					if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']) || $fieldName == 'id')
 						$table_alias = 'multi_shop_'.$this->resourceConfiguration['retrieveData']['table'];
 					else
 						$table_alias = '';