dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jérôme Nadaud
2013-07-29 18:37:18 +02:00
parent 0ecc2fb0a0 db98509443
commit 39a6d0a42d
7 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+1 -1
View File
@@ -1290,7 +1290,7 @@ class CarrierCore extends ObjectModel
public function setGroups($groups, $delete = true)
{
if ($delete)
Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id_carrier);
Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$this->id);
if (!count($groups))
return true;
$sql = 'INSERT INTO '._DB_PREFIX_.'carrier_group (id_carrier, id_group) VALUES ';