Merge pull request #21 from FabianRutishauser/craft-5

feat: #20 added support for streams on delete and restore actions
verbb · Jan 8, 2025 · 596ca8b · 596ca8b
2 parents 572bd71 + d2221ba
commit 596ca8b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/services/Elements.php b/src/services/Elements.php
@@ -238,7 +238,13 @@ private function _getConsolidatedActions(string $elementType, array $dateRange,
 
         foreach ($processed as $action) {
             if ($action['type'] === $type) {
-                $data[] = Json::decode($action['data']);
+                // parse potential stream-resources originating from the query
+                if (gettype($action['data']) === 'resource'
+                    && get_resource_type($action['data']) === 'stream') {
+                    $data[] = Json::decode(stream_get_contents($action['data']));
+                } else {
+                    $data[] = Json::decode($action['data']);
+                }
             }
         }