Handle null values, fixes #18173 (#18174)

glpi-project · Oct 31, 2024 · d92e54e · d92e54e
1 parent a073823
commit d92e54e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CommonDBTM.php b/src/CommonDBTM.php
@@ -4764,7 +4764,7 @@ public static function getSpecificValueToDisplay($field, $values, array $options
      *    - comments : boolean / is the comments displayed near the value (default false)
      *    - any others options passed to specific display method
      *
-     * @return string the string to display
+     * @return mixed the value to display
      **/
     public function getValueToDisplay($field_id_or_search_options, $values, $options = [])
     {

diff --git a/src/Log.php b/src/Log.php
@@ -830,8 +830,8 @@ public static function getHistoryData(CommonDBTM $item, $start = 0, $limit = 0,
                             break;
 
                         default:
-                            $data["old_value"] = RichText::getTextFromHtml($item->getValueToDisplay($searchopt, $data["old_value"]), false, true);
-                            $data["new_value"] = RichText::getTextFromHtml($item->getValueToDisplay($searchopt, $data["new_value"]), false, true);
+                            $data["old_value"] = RichText::getTextFromHtml($item->getValueToDisplay($searchopt, $data["old_value"]) ?? '', false, true);
+                            $data["new_value"] = RichText::getTextFromHtml($item->getValueToDisplay($searchopt, $data["new_value"]) ?? '', false, true);
                             break;
                     }
                 }