Fix #471 - accented characters not displayed correctly

core/backend/Data/LegacyHandler/RecordMapper.php

@@ -64,6 +64,7 @@ public function mapRecords(array $listData, ?array $pageData = []): array
 
             $moduleName = $data['module_name'] ?? '';
             $id = $data['id'] ?? '';
+            $data['name'] = html_entity_decode($data['name'] ?? '', ENT_QUOTES);
             if (!empty($moduleName)) {
                 $moduleName = $this->moduleNameMapper->toFrontEnd($moduleName);
             }

core/backend/Languages/LegacyHandler/AppListStringsHandler.php

@@ -66,6 +66,7 @@ public function getAppListStrings(string $language): ?AppListStrings
         }
 
         $appListStringsArray = return_app_list_strings_language($language);
+        $appListStringsArray = $this->decodeLabels($appListStringsArray);
 
         if (empty($appListStringsArray)) {
             throw new ItemNotFoundException(self::MSG_LANGUAGE_NOT_FOUND . "'$language'");
@@ -79,4 +80,16 @@ public function getAppListStrings(string $language): ?AppListStrings
 
         return $appListStrings;
     }
+
+    protected function decodeLabels(array $appListStringsArray): array
+    {
+        foreach($appListStringsArray as $key => $string){
+            if (!is_array($string)) {
+                $string = html_entity_decode($string ?? '', ENT_QUOTES);
+            }
+            $appListStringsArray[$key] = $string;
+        }
+
+        return $appListStringsArray;
+    }
 }

core/backend/Languages/LegacyHandler/AppStringsHandler.php

@@ -127,6 +127,8 @@ public function getAppStrings(string $language): ?AppStrings
 
         $appStringsArray = return_application_language($language);
 
+        $appStringsArray = $this->decodeLabels($appStringsArray);
+
         if (empty($appStringsArray)) {
             throw new ItemNotFoundException(self::MSG_LANGUAGE_NOT_FOUND . "'$language'");
         }
@@ -268,4 +270,17 @@ protected function injectLicense(array &$appStringsArray): void
             $appStringsArray['SUITE8_LICENSE_CONTENT'] = '<pre>' . $license . '</pre>';
         }
     }
+
+
+    protected function decodeLabels(array $appStringsArray): array
+    {
+        foreach($appStringsArray as $key => $string){
+            if (!is_array($string)) {
+                $string = html_entity_decode($string ?? '', ENT_QUOTES);
+            }
+            $appStringsArray[$key] = $string;
+        }
+
+        return $appStringsArray;
+    }
 }

core/backend/Languages/LegacyHandler/ModStringsHandler.php

@@ -119,7 +119,8 @@ public function getModStrings(string $language): ?ModStrings
         $allModStringsArray = [];
         foreach ($modules as $module) {
             $frontendName = $this->moduleNameMapper->toFrontEnd($module);
-            $moduleStrings = return_module_language($language, $module);
+            $moduleStrings = return_module_language($language, $module) ?? [];
+            $moduleStrings = $this->decodeLabels($moduleStrings);
             if (!empty($moduleStrings)) {
                 $moduleStrings = $this->removeEndingColon($moduleStrings);
             }
@@ -156,4 +157,16 @@ protected function removeEndingColon(array $stringArray): array
 
         return $stringArray;
     }
+
+    protected function decodeLabels(array $moduleStrings): array
+    {
+        foreach($moduleStrings as $key => $string){
+            if (!is_array($string)) {
+                $string = html_entity_decode($string ?? '', ENT_QUOTES);
+            }
+            $moduleStrings[$key] = $string;
+        }
+
+        return $moduleStrings;
+    }
 }

core/backend/Navbar/LegacyHandler/NavbarHandler.php

@@ -399,7 +399,7 @@ protected function setLinks(array $legacyArray): array
 
                 $mappedLink = [
                     'name' => $link[0] ?? '',
-                    'labelKey' => $link[1] ?? '',
+                    'labelKey' => html_entity_decode($link[1] ?? '', ENT_QUOTES),
                     'actionLabelKey' => '',
                     'url' => $path,
                     'icon' => '',

public/legacy/include/portability/ApiBeanMapper/TypeMappers/ParentMapper.php

@@ -111,6 +111,6 @@ public function toBean(SugarBean $bean, array &$container, string $name, string
             $container[$idFieldName] = $id;
         }
 
-        $container[$name] = $value;
+        $container[$name] = html_entity_decode($value, ENT_QUOTES);
     }
 }