From ad270d5ea89c0b7845e7bf239ec92d78ad56a544 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 27 Jul 2011 08:12:31 +0000 Subject: [PATCH] // Fix #PSFV-20 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7747 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Shop.php | 6 +++--- modules/sekeywords/sekeywords.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/Shop.php b/classes/Shop.php index 938fb428f..23e54174c 100644 --- a/classes/Shop.php +++ b/classes/Shop.php @@ -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; diff --git a/modules/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php index 0bcb06df9..12cc0ebdd 100644 --- a/modules/sekeywords/sekeywords.php +++ b/modules/sekeywords/sekeywords.php @@ -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').'