Concatenator bugfixes #71

pimcore · Dec 21, 2022 · 5a2ada6 · 5a2ada6
1 parent c23b806
commit 5a2ada6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/ConfigElement/Operator/Concatenator.php b/src/ConfigElement/Operator/Concatenator.php
@@ -32,6 +32,7 @@ public function __construct($config, $context = null)
     public function getLabeledValue($object)
     {
         $result = new \stdClass();
+        $result->value = null;
         $result->label = $this->label;
 
         $hasValue = true;
@@ -46,8 +47,10 @@ public function getLabeledValue($object)
             $value = $c->getLabeledValue($object) ? $c->getLabeledValue($object)->value : null;
 
             if (!$hasValue) {
-                if (!empty($value) || ((method_exists($value, 'isEmpty') && !$value->isEmpty()))) {
-                    $hasValue = true;
+                if (is_object($value) && method_exists($value, 'isEmpty')) {
+                    $hasValue = !$value->isEmpty();
+                } else {
+                    $hasValue = !empty($value);
                 }
             }