From 19eef5bd7256f0e40ead3f49d45126fb31dc9cf0 Mon Sep 17 00:00:00 2001 From: acognet Date: Wed, 22 Dec 2021 16:33:37 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B04578=20-=20Dict::CloneString=20replace?= =?UTF-8?q?=20entry=20if=20already=20exists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/dict.class.inc.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/dict.class.inc.php b/core/dict.class.inc.php index 8bbf7afb4..a8c9c5102 100644 --- a/core/dict.class.inc.php +++ b/core/dict.class.inc.php @@ -299,16 +299,15 @@ class Dict /** * Clone a string in every language (if it exists in that language) + * since 3.0.1 Not clone sSourceCode entry if sDestCode entry already exist * * @param $sSourceCode * @param $sDestCode */ public static function CloneString($sSourceCode, $sDestCode) { - foreach(self::$m_aLanguages as $sLanguageCode => $foo) - { - if (isset(self::$m_aData[$sLanguageCode][$sSourceCode])) - { + foreach(self::$m_aLanguages as $sLanguageCode => $foo) { + if (isset(self::$m_aData[$sLanguageCode][$sSourceCode]) && !isset(self::$m_aData[$sLanguageCode][$sDestCode] )) { self::$m_aData[$sLanguageCode][$sDestCode] = self::$m_aData[$sLanguageCode][$sSourceCode]; } }