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

2013-03-01 17:18:07 +01:00
parent e385e2d19c 8af272f6e3
commit 42bb2a506c
8 changed files with 42 additions and 21 deletions
@@ -280,6 +280,7 @@
 				{
 					"action":"UpdateProductImageShopAsso",
 					"id_image":id,
+					"id_product":id_product,
 					"id_shop": id_shop,
 					"active":active,
 					"token" : "{/literal}{$token}{literal}",