tiamak/advancedmegamenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded check

Browse Source
This commit is contained in:
Daniel Hlaváček
2023-12-30 14:19:24 +01:00
committed by GitHub
parent 4ea9a50d7e
commit e51c32556b
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ps_mainmenu.php
+5 -12
View File
@@ -848,11 +848,9 @@ class Ps_MainMenu extends Module implements WidgetInterface
$join_shop = '';
$where_shop = '';
if (Tools::version_compare(_PS_VERSION_, '1.6.0.12', '>=') == true) {
$join_shop = ' INNER JOIN `' . _DB_PREFIX_ . 'cms_category_shop` cs
ON (bcp.`id_cms_category` = cs.`id_cms_category`)';
$where_shop = ' AND cs.`id_shop` = ' . (int) $id_shop . ' AND cl.`id_shop` = ' . (int) $id_shop;
}
$join_shop = ' INNER JOIN `' . _DB_PREFIX_ . 'cms_category_shop` cs
ON (bcp.`id_cms_category` = cs.`id_cms_category`)';
$where_shop = ' AND cs.`id_shop` = ' . (int) $id_shop . ' AND cl.`id_shop` = ' . (int) $id_shop;
if ($recursive === false) {
$sql = 'SELECT bcp.`id_cms_category`, bcp.`id_parent`, bcp.`level_depth`, bcp.`active`, bcp.`position`, cl.`name`, cl.`link_rewrite`
@@ -893,11 +891,6 @@ class Ps_MainMenu extends Module implements WidgetInterface
$id_shop = ($id_shop !== false) ? (int) $id_shop : (int) Context::getContext()->shop->id;
$id_lang = $id_lang ? (int) $id_lang : (int) Context::getContext()->language->id;
$where_shop = '';
if (Tools::version_compare(_PS_VERSION_, '1.6.0.12', '>=') == true) {
$where_shop = ' AND cl.`id_shop` = ' . (int) $id_shop;
}
$sql = 'SELECT c.`id_cms`, cl.`meta_title`, cl.`link_rewrite`
FROM `' . _DB_PREFIX_ . 'cms` c
INNER JOIN `' . _DB_PREFIX_ . 'cms_shop` cs
@@ -906,8 +899,8 @@ class Ps_MainMenu extends Module implements WidgetInterface
ON (c.`id_cms` = cl.`id_cms`)
WHERE c.`id_cms_category` = ' . (int) $id_cms_category . '
AND cs.`id_shop` = ' . (int) $id_shop . '
AND cl.`id_lang` = ' . (int) $id_lang .
$where_shop . '
AND cl.`id_lang` = ' . (int) $id_lang . '
AND cl.`id_shop` = ' . (int) $id_shop . '
AND c.`active` = 1
ORDER BY `position`';