Update view listener to pass vars to layout

[zf2.biz/galerie.git] / module / Application / src / Application / View / Listener.php

diff --git a/module/Application/src/Application/View/Listener.php b/module/Application/src/Application/View/Listener.php
index ac4c4b7..fc99fba 100644 (file)
--- a/module/Application/src/Application/View/Listener.php
+++ b/module/Application/src/Application/View/Listener.php
@@ -127,7 +127,7 @@ class Listener implements ListenerAggregate
 
         $content    = $this->view->render($script, $vars);
 
-        $e->setResult($content);
+        $e->setParam('content', $content);
         return $content;
     }
 
@@ -142,13 +142,15 @@ class Listener implements ListenerAggregate
             return $response;
         }
 
-        $footer   = $e->getParam('footer', false);
-        $vars     = array('footer' => $footer);
+        $vars = $e->getResult();
+        if (is_scalar($vars)) {
+            $vars = array('content' => $vars);
+        } elseif (is_object($vars) && !$vars instanceof ArrayAccess) {
+            $vars = (array) $vars;
+        }
 
         if (false !== ($contentParam = $e->getParam('content', false))) {
             $vars['content'] = $contentParam;
-        } else {
-            $vars['content'] = $e->getResult();
         }
 
         $layout   = $this->view->render($this->layout, $vars);