Merge remote-tracking branch 'origin/support/3.1' into develop

This commit is contained in:
Anne-Cath
2024-01-15 16:35:57 +01:00
8 changed files with 208 additions and 71 deletions

View File

@@ -3712,7 +3712,7 @@ HTML;
if ($oAttDef->GetEditClass() == 'Document') {
/** @var \ormDocument $oDocument */
$oDocument = $this->Get($sAttCode);
if (!$oDocument->IsEmpty()) {
if (is_object($oDocument) && !$oDocument->IsEmpty()) {
$sFieldAsHtml = $this->GetAsHTML($sAttCode);
$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');