Fix cascading data. Closes #1550

statamic · Sep 4, 2020 · 6d36145 · 6d36145 · acurrieclark · Sep 7, 2020
1 parent 8fdc0c1
commit 6d36145
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/View/Antlers/Parser.php b/src/View/Antlers/Parser.php
@@ -595,9 +595,15 @@ public function parseCallbackTags($text, $data)
                     }
 
                     if (! empty($values)) {
-                        // parse the tag found with the value(s) related to it
-                        $tmpname = md5($name);
-                        $replacement = $this->parseVariables("{{ $tmpname }}$content{{ /$tmpname }}", [$tmpname => $values]);
+                        if (Arr::isAssoc($values)) {
+                            $replacement = $this->parse($content, array_merge($data, $values));
+                        } else {
+                            $values = $this->addLoopIterationVariables($values);
+                            $replacement = collect($values)
+                                ->map(function ($value) use ($content, $data) {
+                                    return (string) $this->parse($content, array_merge($data, $value));
+                                })->join('');
+                        }
                     }
                 } else {
                     // nope, this must be a callback