Merge branch 'master' into is-iterable

kitodo · Jun 22, 2023 · 8cf1597 · 8cf1597
2 parents 2cf9e29 + 70fbfce
commit 8cf1597
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php b/Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php
@@ -112,7 +112,7 @@ function($arguments, $cPid)
 
                 // Load document with current plugin parameters.
                 $this->loadDocument($queryParams['tx_dlf'], $cPid);
-                if ($this->document === null) {
+                if ($this->document === null || $this->document->getDoc() === null) {
                     return $type;
                 }
                 // Set PID for metadata definitions.
@@ -196,7 +196,7 @@ protected function loadDocument($requestData, int $pid)
                 }
             }
         } else {
-            $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+            $this->logger->error('Empty UID or invalid PID "' . $pid . '" for document loading');
         }
     }
 }