Merge branch 'develop' of https://github.com/wilmoore/zf2 into hotfix…

…/event_manager-priority_queue_api
zendframework · Mar 17, 2011 · 4235f98 · 4235f98
2 parents dc83fe5 + 73b9365
commit 4235f98
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php
@@ -154,12 +154,13 @@ public function triggerUntil($event, $context, $argv, $callback)
 
         $responses = new ResponseCollection;
         $e         = new $this->eventClass($event, $context, $argv);
+        $handlers  = $this->getHandlers($event);
 
-        if (empty($this->events[$event])) {
+        if ($handlers->isEmpty()) {
             return $this->triggerStaticHandlers($callback, $e, $responses);
         }
 
-        foreach ($this->events[$event] as $handler) {
+        foreach ($handlers as $handler) {
             $responses->push(call_user_func($handler->getCallback(), $e));
             if ($e->propagationIsStopped()) {
                 $responses->setStopped(true);
@@ -170,6 +171,7 @@ public function triggerUntil($event, $context, $argv, $callback)
                 break;
             }
         }
+
         if (!$responses->stopped()) {
             $this->triggerStaticHandlers($callback, $e, $responses);
         }