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

[-] Core : you must always have an id_shop in a SQL query, not null

Browse Source
This commit is contained in:
Damien Metzger
2013-02-28 11:45:01 +01:00
parent 18cc4f2d7c
commit 74bcfeecf0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+1 -1
View File
@@ -943,7 +943,7 @@ class ShopCore extends ObjectModel
public static function addSqlRestrictionOnLang($alias = null, $id_shop = null) public static function addSqlRestrictionOnLang($alias = null, $id_shop = null)
{ {
if (is_null($id_shop)) if (is_null($id_shop))
$id_shop = Context::getContext()->shop->id; $id_shop = Shop::getContextShopID();
return ' AND '.(($alias) ? $alias.'.' : '').'id_shop = '.$id_shop.' '; return ' AND '.(($alias) ? $alias.'.' : '').'id_shop = '.$id_shop.' ';
} }
modules/loyalty/loyalty.php
+1 -1
View File
@@ -82,7 +82,7 @@ class Loyalty extends Module
Configuration::updateValue('PS_LOYALTY_VOUCHER_DETAILS', $conf); Configuration::updateValue('PS_LOYALTY_VOUCHER_DETAILS', $conf);
$category_config = ''; $category_config = '';
$categories = Category::getSimpleCategories((int)(Configuration::get('PS_LANG_DEFAULT'))); $categories = Category::getSimpleCategories((int)Configuration::get('PS_LANG_DEFAULT'));
foreach ($categories as $category) foreach ($categories as $category)
$category_config .= (int)$category['id_category'].','; $category_config .= (int)$category['id_category'].',';
$category_config = rtrim($category_config, ','); $category_config = rtrim($category_config, ',');