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

// Fix #PSFV-20

Browse Source
This commit is contained in:
rMalie
2011-07-27 08:12:31 +00:00
parent 833e7b3f35
commit 03b5d8ae50
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Shop.php
+3 -3
View File
@@ -617,14 +617,14 @@ class ShopCore extends ObjectModel
if ($type == 'group_shop') if ($type == 'group_shop')
{ {
if ($shopID) if ($shopID)
$restriction = ' AND '.$alias.'id_group_shop = '.Shop::getGroupFromShop($shopID); $restriction = ' AND '.$alias.'id_group_shop = '.Shop::getGroupFromShop($shopID).' ';
else if ($shopGroupID) else if ($shopGroupID)
$restriction = ' AND '.$alias.'id_group_shop = '.$shopGroupID; $restriction = ' AND '.$alias.'id_group_shop = '.$shopGroupID.' ';
} }
else else
{ {
if ($shopID || $shopGroupID) if ($shopID || $shopGroupID)
$restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', $this->getListOfID($share)).')'; $restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', $this->getListOfID($share)).') ';
} }
return $restriction; return $restriction;
modules/sekeywords/sekeywords.php
+1 -1
View File
@@ -48,7 +48,7 @@ class SEKeywords extends ModuleGraph
FROM `'._DB_PREFIX_.'sekeyword` FROM `'._DB_PREFIX_.'sekeyword`
WHERE '.(Configuration::get('SEK_FILTER_KW') == '' ? '1' : '`keyword` REGEXP \''.pSQL(Configuration::get('SEK_FILTER_KW')).'\'') WHERE '.(Configuration::get('SEK_FILTER_KW') == '' ? '1' : '`keyword` REGEXP \''.pSQL(Configuration::get('SEK_FILTER_KW')).'\'')
.$this->sqlShopRestriction(). .$this->sqlShopRestriction().
'AND `date_add` BETWEEN '; ' AND `date_add` BETWEEN ';
$this->_query2 = 'GROUP BY TRIM(`keyword`) $this->_query2 = 'GROUP BY TRIM(`keyword`)
HAVING occurences > '.(int)Configuration::get('SEK_MIN_OCCURENCES').' HAVING occurences > '.(int)Configuration::get('SEK_MIN_OCCURENCES').'