make sure callback is called

bakura10 · May 15, 2014 · 01b2975 · 01b2975
1 parent 1083e75
commit 01b2975
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php
@@ -190,7 +190,7 @@ public function trigger($eventName, EventInterface $event = null, callable $call
                 $lastResponse = $listener($event);
                 $responses[]  = $lastResponse;
 
-                if ($event->isPropagationStopped() || ($callback && $callback($lastResponse))) {
+                if (($callback && $callback($lastResponse) || $event->isPropagationStopped())) {
                     $responseCollection = new ResponseCollection($responses);
                     $responseCollection->setStopped(true);
 

diff --git a/library/Zend/EventManager/FastEventManager.php b/library/Zend/EventManager/FastEventManager.php
@@ -104,7 +104,7 @@ public function trigger($eventName, EventInterface $event = null, callable $call
                 $lastResponse = $listener($event);
                 $responses[]  = $lastResponse;
 
-                if ($event->isPropagationStopped() || ($callback && $callback($lastResponse))) {
+                if (($callback && $callback($lastResponse) || $event->isPropagationStopped())) {
                     $responseCollection = new ResponseCollection($responses);
                     $responseCollection->setStopped(true);