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

[-] BO : Fixed SQL crash with an empty shop list #PSCFV-2946

Browse Source
This commit is contained in:
dMetzger
2012-07-05 14:18:22 +00:00
parent bcec20aaff
commit 9a877f14c9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+1 -1
View File
@@ -232,7 +232,7 @@
id="shop_select_add" id="shop_select_add"
style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
> >
{l s='Add'} >>
</a> </a>
</td> </td>
<td> <td>
classes/CartRule.php
+2 -2
View File
@@ -943,9 +943,9 @@ class CartRuleCore extends ObjectModel
$shop_list = ''; $shop_list = '';
if ($type == 'shop') if ($type == 'shop')
{ {
$shop_list = ' AND t.id_shop IN (';
$shops = Context::getContext()->employee->getAssociatedShops(); $shops = Context::getContext()->employee->getAssociatedShops();
$shop_list .= implode(array_map('intval', $shops), ',').')'; if (count($shops))
$shop_list = ' AND t.id_shop IN ('.implode(array_map('intval', $shops), ',').') ';
} }
if (!Validate::isLoadedObject($this) OR $this->{$type.'_restriction'} == 0) if (!Validate::isLoadedObject($this) OR $this->{$type.'_restriction'} == 0)