Global event listener bug fix.

swoft-cloud · Jun 30, 2020 · f028ba9 · f028ba9
1 parent 65f7a28
commit f028ba9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/event/src/Manager/EventManager.php b/src/event/src/Manager/EventManager.php
@@ -303,6 +303,11 @@ public function trigger($event, $target = null, array $args = []): EventInterfac
             $shouldCall[$name] = '';
         }
 
+        // Have global wildcards '*' listener.
+        if (isset($this->listenedEvents['*'])) {
+            $shouldCall['*'] = '';
+        }
+
         // Like 'app.db.query' => prefix: 'app.db'
         if ($pos = strrpos($name, '.')) {
             $prefix = substr($name, 0, $pos);
@@ -339,12 +344,7 @@ public function trigger($event, $target = null, array $args = []): EventInterfac
             }
         }
 
-        // Have global wildcards '*' listener.
-        if (isset($this->listenedEvents['*'])) {
-            $this->triggerListeners($this->listeners['*'], $event);
-        }
-
-        return $this->destroyAfterFire ? $event->destroy() : $event;
+        return $event;
     }
 
     /**