MvcEvent target should be changed back to the application on finish

zendframework · Mar 20, 2012 · 4c710dc · 4c710dc
1 parent c1d855e
commit 4c710dc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
@@ -235,6 +235,7 @@ public function run()
         if ($result->stopped()) {
             $response = $result->last();
             if ($response instanceof Response) {
+                $event->setTarget($this);
                 $events->trigger('finish', $event);
                 return $response;
             }
@@ -253,6 +254,7 @@ public function run()
         // Complete response
         $response = $result->last();
         if ($response instanceof Response) {
+            $event->setTarget($this);
             $events->trigger('finish', $event);
             return $response;
         }
@@ -275,6 +277,7 @@ public function run()
     protected function completeRequest(MvcEvent $event)
     {
         $events = $this->events();
+        $event->setTarget($this);
         $events->trigger('render', $event);
         $events->trigger('finish', $event);
         return $event->getResponse();