From cb2a597267c7a1220bb2b0b150eeb39fa522b939 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 7 Sep 2022 10:33:31 +0200 Subject: [PATCH] Fix notice on empty case log --- core/ormcaselog.class.inc.php | 41 +++++++++++++++-------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/core/ormcaselog.class.inc.php b/core/ormcaselog.class.inc.php index 950ff06274..34a0b8ac08 100644 --- a/core/ormcaselog.class.inc.php +++ b/core/ormcaselog.class.inc.php @@ -702,30 +702,25 @@ class ormCaseLog { { $sRes = ''; $aLastEntry = end($this->m_aIndex); - $sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']); - switch($sFormat) - { - case static::ENUM_FORMAT_TEXT: - if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) - { - $sRes = $sRaw; + if ($aLastEntry !== false) { + $sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']); + switch ($sFormat) { + case static::ENUM_FORMAT_TEXT: + if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) { + $sRes = $sRaw; + } else { + $sRes = utils::HtmlToText($sRaw); + } + break; + + case static::ENUM_FORMAT_HTML: + if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) { + $sRes = utils::TextToHtml($sRaw); + } else { + $sRes = InlineImage::FixUrls($sRaw); + } + break; } - else - { - $sRes = utils::HtmlToText($sRaw); - } - break; - - case static::ENUM_FORMAT_HTML: - if ($aLastEntry['format'] == static::ENUM_FORMAT_TEXT) - { - $sRes = utils::TextToHtml($sRaw); - } - else - { - $sRes = InlineImage::FixUrls($sRaw); - } - break; } return $sRes; }