Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release version 2.3.3 #75

Merged
merged 12 commits into from
Jan 3, 2024
Merged

Release version 2.3.3 #75

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01f86bc
update php-dev-tools v3tov4, github actions v2tov3
leemyongpakvn May 16, 2023
97b3e4a
Merge pull request #68 from leemyongpakvn/upate_PHPdevtools_v3tov4_GI…
kpodemski May 22, 2023
dd3e382
Update build-release.yml with Org config
leemyongpakvn Jun 18, 2023
d7cd8a8
Merge pull request #71 from PrestaShop/leemyongpakvn-patch-1
kpodemski Jun 19, 2023
ddeec43
Update README.md
florine2623 Jul 6, 2023
5f98e47
Merge pull request #72 from PrestaShop/add-ps-compatibility
mflasquin Jul 7, 2023
c4ef63d
Update README.md
florine2623 Aug 3, 2023
39895ba
Merge pull request #73 from PrestaShop/add-qa-how-to-test
Hlavtox Aug 3, 2023
852663b
Standardize version check
Hlavtox Dec 28, 2023
4ea9a50
Merge pull request #74 from Hlavtox/standard-check
Hlavtox Dec 28, 2023
e51c325
Remove unneeded check
Hlavtox Dec 30, 2023
096d7a9
Merge pull request #76 from Hlavtox/modernize
Hlavtox Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions ps_mainmenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,11 +848,9 @@ protected function getCMSCategories($recursive = false, $parent = 1, $id_lang =
$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`
Expand Down Expand Up @@ -893,11 +891,6 @@ protected function getCMSPages($id_cms_category, $id_shop = false, $id_lang = fa
$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
Expand All @@ -906,8 +899,8 @@ protected function getCMSPages($id_cms_category, $id_shop = false, $id_lang = fa
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`';

Expand Down