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

// Fix #PSFV-20

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7747 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 08:12:31 +00:00
parent ad27647a98
commit ad270d5ea8
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 ($shopID)
$restriction = ' AND '.$alias.'id_group_shop = '.Shop::getGroupFromShop($shopID);
$restriction = ' AND '.$alias.'id_group_shop = '.Shop::getGroupFromShop($shopID).' ';
else if ($shopGroupID)
$restriction = ' AND '.$alias.'id_group_shop = '.$shopGroupID;
$restriction = ' AND '.$alias.'id_group_shop = '.$shopGroupID.' ';
}
else
{
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;
modules/sekeywords/sekeywords.php
+1 -1
View File
@@ -48,7 +48,7 @@ class SEKeywords extends ModuleGraph
FROM `'._DB_PREFIX_.'sekeyword`
WHERE '.(Configuration::get('SEK_FILTER_KW') == '' ? '1' : '`keyword` REGEXP \''.pSQL(Configuration::get('SEK_FILTER_KW')).'\'')
.$this->sqlShopRestriction().
'AND `date_add` BETWEEN ';
' AND `date_add` BETWEEN ';
$this->_query2 = 'GROUP BY TRIM(`keyword`)
HAVING occurences > '.(int)Configuration::get('SEK_MIN_OCCURENCES').'