// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 08:57:51 +00:00
parent 9619b93c73
commit e62be3d793
41 changed files with 263 additions and 191 deletions
@@ -63,7 +63,7 @@ class ShopUrlCore extends ObjectModel
 				FROM '._DB_PREFIX_.'shop_url
 				WHERE 1
 					'.($id_shop ? ' AND id_shop = '.(int)$id_shop : '');
-		return Db::getInstance()->ExecuteS();
+		return Db::getInstance()->ExecuteS($sql);
 	}
 		
 	public function setMain()