fix: only set actor on events that have it

flarum · Oct 29, 2023 · d304e17 · d304e17
1 parent d154388
commit d304e17
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/framework/core/src/Foundation/DispatchEventsTrait.php b/framework/core/src/Foundation/DispatchEventsTrait.php
@@ -25,7 +25,9 @@ public function dispatchEventsFor(mixed $entity, User $actor = null): void
         }
 
         foreach ($entity->releaseEvents() as $event) {
-            $event->actor = $actor;
+            if (property_exists($event, 'actor') && ! $event->actor) {
+                $event->actor = $actor;
+            }
 
             $this->events->dispatch($event);
         }