Update src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php

Co-authored-by: Andrew Longosz <[email protected]>
ibexa · Sep 14, 2023 · 35a8585 · 35a8585
1 parent 1ca59c0
commit 35a8585
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php b/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php
@@ -167,18 +167,17 @@ private function getValues(
                 continue;
             }
 
-            $field = $fieldMap ? $fieldMap[$identifier][$languageCode] ?? '' : $content->getFieldValue(
-                $identifier,
-                $languageCode
-            );
+            if (!empty($fieldMap)) {
+                $fieldValue = $fieldMap[$identifier][$languageCode] ?? null;
+            } else {
+                $fieldValue = $content !== null ? $content->getFieldValue($identifier, $languageCode) : null;
+            }
 
-            $field = $field ? $persistenceFieldType->getName(
-                $field,
+            $tokenValues[$identifier] = $fieldValue !== null ? $persistenceFieldType->getName(
+                $fieldValue,
                 $fieldDefinition,
                 $languageCode
             ) : '';
-
-            $tokenValues[$identifier] = $field;
         }
 
         return $tokenValues;