X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=module%2FApplication%2Fsrc%2FApplication%2FView%2FListener.php;h=fc99fbaf2bcfbd0ec6ba250b6f983a8c636c6a66;hb=ef4bab29af1e4dd5aac3f87f1c3d8391808d514d;hp=ac4c4b7f6165a4982a3df29796eeb03cef254856;hpb=491bd52235289a2eeddc865797b338b95e6269be;p=zf2.biz%2Fapplication_blanche.git diff --git a/module/Application/src/Application/View/Listener.php b/module/Application/src/Application/View/Listener.php index ac4c4b7..fc99fba 100644 --- 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);