From d096a5845e844aabb21a4aba41c7ae398bf104ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 17 May 2013 16:35:21 +0200 Subject: [PATCH 1/2] [-] MO: Fix #PSCFV-8973 product images in the blockviewed module --- modules/blockviewed/blockviewed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php index 0ea240300..611fe1b04 100644 --- a/modules/blockviewed/blockviewed.php +++ b/modules/blockviewed/blockviewed.php @@ -101,13 +101,13 @@ class BlockViewed extends Module $productIds = implode(',', $productsViewed); $productsImages = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' - SELECT image_shop.id_image, p.id_product, il.legend, product_shop.active, pl.name, pl.description_short, pl.link_rewrite, cl.link_rewrite AS category_rewrite + SELECT MAX(image_shop.id_image) id_image, p.id_product, il.legend, product_shop.active, pl.name, pl.description_short, pl.link_rewrite, cl.link_rewrite AS category_rewrite FROM '._DB_PREFIX_.'product p '.Shop::addSqlAssociation('product', 'p').' LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = p.id_product'.Shop::addSqlRestrictionOnLang('pl').') LEFT JOIN '._DB_PREFIX_.'image i ON (i.id_product = p.id_product)'. Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').' - LEFT JOIN '._DB_PREFIX_.'image_lang il ON (il.id_image = i.id_image) + LEFT JOIN '._DB_PREFIX_.'image_lang il ON (il.id_image = image_shop.id_image) LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = product_shop.id_category_default'.Shop::addSqlRestrictionOnLang('cl').') WHERE p.id_product IN ('.$productIds.') AND pl.id_lang = '.(int)($params['cookie']->id_lang).' From 626e556575eef1d08711e423f382eda87b6a18d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 17 May 2013 17:10:11 +0200 Subject: [PATCH 2/2] [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 --- classes/Category.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/Category.php b/classes/Category.php index ac211811c..1c63ff592 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -684,8 +684,7 @@ class CategoryCore extends ObjectModel else return new Category($shop->getCategory(), $id_lang); $is_more_than_one_root_category = count(Category::getCategoriesWithoutParent()) > 1; - if ((!Shop::isFeatureActive() && $is_more_than_one_root_category) || - Shop::isFeatureActive() && $is_more_than_one_root_category && Shop::getContext() != Shop::CONTEXT_SHOP) + if (Shop::isFeatureActive() && $is_more_than_one_root_category && Shop::getContext() != Shop::CONTEXT_SHOP) $category = Category::getTopCategory($id_lang); else $category = new Category($shop->getCategory(), $id_lang);