From 4613aa06bd05043f7c6db7017cfc08c5fc6a7594 Mon Sep 17 00:00:00 2001 From: amit sharma Date: Tue, 22 Sep 2026 18:21:47 +0530 Subject: [PATCH 1/2] Fixed: Prevent duplicate English language entries when installing another language Co-authored-by: Name --- classes/Language.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/Language.php b/classes/Language.php index e4a61b0a4..91865ca4f 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -836,6 +836,8 @@ class LanguageCore extends ObjectModel return false; } + Cache::store('Language::getIdByIso_'.$iso_code, $lang->id); + if (isset($params_lang['allow_accented_chars_url']) && in_array($params_lang['allow_accented_chars_url'], array('1', 'true'))) { Configuration::updateGlobalValue('PS_ALLOW_ACCENTED_CHARS_URL', 1); } From c666da38ca87f43dd59d637879082d7127070999 Mon Sep 17 00:00:00 2001 From: amit sharma Date: Thu, 1 Oct 2026 16:15:23 +0530 Subject: [PATCH 2/2] Fixed: resolve code review changes Co-authored-by: Name --- classes/Language.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/Language.php b/classes/Language.php index 91865ca4f..28966f0b0 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -689,7 +689,11 @@ class LanguageCore extends ObjectModel $key = 'Language::getIdByIso_'.$iso_code; if ($no_cache || !Cache::isStored($key)) { $id_lang = Db::getInstance()->getValue('SELECT `id_lang` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\''); - + + if (empty($id_lang)) { + return null; + } + Cache::store($key, $id_lang); return $id_lang; } @@ -836,8 +840,6 @@ class LanguageCore extends ObjectModel return false; } - Cache::store('Language::getIdByIso_'.$iso_code, $lang->id); - if (isset($params_lang['allow_accented_chars_url']) && in_array($params_lang['allow_accented_chars_url'], array('1', 'true'))) { Configuration::updateGlobalValue('PS_ALLOW_ACCENTED_CHARS_URL', 1); }