Prefer label over value in the backed lead list

terminal42 · Sep 27, 2024 · 1aa3063 · 1aa3063
1 parent 5a8b532
commit 1aa3063
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/EventListener/DataContainer/LeadLabelListener.php b/src/EventListener/DataContainer/LeadLabelListener.php
@@ -45,13 +45,13 @@ public function __invoke(array $row, string $label): string
             '_member' => $this->formatToken($lead['member_name'], $row['member_id']),
         ];
 
-        $values = $this->connection->fetchAllKeyValue('SELECT name, value FROM tl_lead_data WHERE pid=?', [$row['id']]);
+        $records = $this->connection->fetchAllAssociative('SELECT name, value, label FROM tl_lead_data WHERE pid=?', [$row['id']]);
 
-        foreach ($values as $name => $value) {
+        foreach ($records as $record) {
             if ($this->stringParser) {
-                $this->stringParser->flatten(StringUtil::deserialize($value), $name, $tokens);
+                $this->stringParser->flatten(StringUtil::deserialize($record['label'] ?: $record['value']), $record['name'], $tokens);
             } else {
-                \Haste\Util\StringUtil::flatten(StringUtil::deserialize($value), $name, $tokens);
+                \Haste\Util\StringUtil::flatten(StringUtil::deserialize($record['label'] ?: $record['value']), $record['name'], $tokens);
             }
         }