// Fix CMS getRecurseCategory in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11551 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -176,7 +176,7 @@ class CMSCategoryCore extends ObjectModel
|
|||||||
FROM `'._DB_PREFIX_.'cms_category` c
|
FROM `'._DB_PREFIX_.'cms_category` c
|
||||||
JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON c.`id_cms_category` = cl.`id_cms_category`
|
JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON c.`id_cms_category` = cl.`id_cms_category`
|
||||||
WHERE c.`id_cms_category` = '.(int)$current.'
|
WHERE c.`id_cms_category` = '.(int)$current.'
|
||||||
AND `id_lang` = '.$id_lang;
|
AND `id_lang` = '.(int)$id_lang;
|
||||||
$category = Db::getInstance()->getRow($sql);
|
$category = Db::getInstance()->getRow($sql);
|
||||||
|
|
||||||
$sql = 'SELECT c.`id_cms_category`
|
$sql = 'SELECT c.`id_cms_category`
|
||||||
@@ -192,7 +192,8 @@ class CMSCategoryCore extends ObjectModel
|
|||||||
'.$shop->addSqlAssociation('cms', 'c', false).'
|
'.$shop->addSqlAssociation('cms', 'c', false).'
|
||||||
JOIN `'._DB_PREFIX_.'cms_lang` cl ON c.`id_cms` = cl.`id_cms`
|
JOIN `'._DB_PREFIX_.'cms_lang` cl ON c.`id_cms` = cl.`id_cms`
|
||||||
WHERE `id_cms_category` = '.(int)$current.'
|
WHERE `id_cms_category` = '.(int)$current.'
|
||||||
AND cl.`id_lang` = '.$id_lang.($active ? ' AND c.`active` = 1' : '').'
|
AND cl.`id_lang` = '.(int)$id_lang.($active ? ' AND c.`active` = 1' : '').'
|
||||||
|
GROUP BY c.id_cms
|
||||||
ORDER BY c.`position`';
|
ORDER BY c.`position`';
|
||||||
$category['cms'] = Db::getInstance()->executeS($sql);
|
$category['cms'] = Db::getInstance()->executeS($sql);
|
||||||
if ($links == 1)
|
if ($links == 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user