From e350255bd7cccc3b4cf39f1a332c79d6d3834dec Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:57:44 +0300
Subject: [PATCH] fix null check

---
 application/Espo/Core/Htmlizer/Htmlizer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php
index 9b5efac47d..5b5eef9213 100644
--- a/application/Espo/Core/Htmlizer/Htmlizer.php
+++ b/application/Espo/Core/Htmlizer/Htmlizer.php
@@ -390,8 +390,10 @@ class Htmlizer
                     $translationPath = $this->metadata
                         ->get(['entityDefs', $entity->getEntityType(), 'fields', $attribute, 'translation']);
 
-                    if ($translationPath) {
-                        $data[$attribute] = $this->language->get($translationPath . '.' . $data[$keyRaw], $data[$attribute]);
+                    if ($translationPath && $data[$keyRaw] !== null) {
+                        $path = $translationPath . '.' . $data[$keyRaw];
+
+                        $data[$attribute] = $this->language->get($path, $data[$keyRaw]);
                     }
                 }