// Fix #PSCFV-4474
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17686 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
1ae4edb9cd
commit
980cbdc6de
1 file changed
+1
-3
@@ -138,7 +138,7 @@ class AdminProductsControllerCore extends AdminController
|
|||||||
if (Validate::isLoadedObject($this->_category) && empty($this->_filter))
|
if (Validate::isLoadedObject($this->_category) && empty($this->_filter))
|
||||||
$join_category = true;
|
$join_category = true;
|
||||||
|
|
||||||
$this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = a.`id_product`)';
|
$this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = a.`id_product` '.(!Shop::isFeatureActive() ? ' AND i.cover=1' : '').')';
|
||||||
if (Shop::isFeatureActive())
|
if (Shop::isFeatureActive())
|
||||||
{
|
{
|
||||||
$alias = 'sa';
|
$alias = 'sa';
|
||||||
@@ -171,8 +171,6 @@ class AdminProductsControllerCore extends AdminController
|
|||||||
|
|
||||||
if (Shop::isFeatureActive())
|
if (Shop::isFeatureActive())
|
||||||
$this->_where .= ' AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))';
|
$this->_where .= ' AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))';
|
||||||
else
|
|
||||||
$this->_where .= ' AND (i.cover=1 OR i.id_image IS NULL)';
|
|
||||||
|
|
||||||
$this->fields_list = array();
|
$this->fields_list = array();
|
||||||
$this->fields_list['id_product'] = array(
|
$this->fields_list['id_product'] = array(
|
||||||
|
|||||||
Reference in new issue
Block a user