diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Application/Resource/View.php --- a/web/lib/Zend/Application/Resource/View.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Application/Resource/View.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 22965 2010-09-18 17:45:51Z intiilapa $ + * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract @@ -52,9 +52,8 @@ { $view = $this->getView(); - $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer(); + $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $viewRenderer->setView($view); - Zend_Controller_Action_HelperBroker::addHelper($viewRenderer); return $view; } @@ -78,6 +77,9 @@ if (isset($options['contentType'])) { $this->_view->headMeta()->appendHttpEquiv('Content-Type', $options['contentType']); } + if (isset($options['assign']) && is_array($options['assign'])) { + $this->_view->assign($options['assign']); + } } return $this->_view; }