diff --git a/application/Espo/Core/Utils/Language.php b/application/Espo/Core/Utils/Language.php index ef34ab992b..15bd123942 100644 --- a/application/Espo/Core/Utils/Language.php +++ b/application/Espo/Core/Utils/Language.php @@ -403,7 +403,6 @@ class Language if (is_string($subData)) { $subData = str_replace('<', '<', $subData); $subData = str_replace('>', '>', $subData); - $subData = str_replace('"', '"', $subData); } } } diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json index 51b70537f4..71efed6bab 100644 --- a/application/Espo/Resources/metadata/clientDefs/Email.json +++ b/application/Espo/Resources/metadata/clientDefs/Email.json @@ -50,7 +50,8 @@ }, { "label":"Folders", - "link":"#EmailFolder" + "link":"#EmailFolder", + "configCheck": "!emailFoldersDisabled" }, { "label":"Filters", diff --git a/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tpl index 933344685d..b81c811c95 100644 --- a/client/res/templates/site/navbar.tpl +++ b/client/res/templates/site/navbar.tpl @@ -1,6 +1,6 @@