From a9756cb5eb8d905930e06318711fc71efc89d59a Mon Sep 17 00:00:00 2001
From: Sami Mazouz <sychocouldy@gmail.com>
Date: Fri, 10 Nov 2023 22:25:10 +0100
Subject: [PATCH] fix: only set actor on events that have it (#3914)

---
 framework/core/src/Foundation/DispatchEventsTrait.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/core/src/Foundation/DispatchEventsTrait.php b/framework/core/src/Foundation/DispatchEventsTrait.php
index 5c40079e4..04aca149c 100644
--- a/framework/core/src/Foundation/DispatchEventsTrait.php
+++ b/framework/core/src/Foundation/DispatchEventsTrait.php
@@ -25,7 +25,9 @@ trait DispatchEventsTrait
         }
 
         foreach ($entity->releaseEvents() as $event) {
-            $event->actor = $actor;
+            if (property_exists($event, 'actor') && ! $event->actor) {
+                $event->actor = $actor;
+            }
 
             $this->events->dispatch($event);
         }