Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/zendframework/zf2

  • Loading branch information...
commit 37995a5e2ec8aa3314955241d0b155b3ee13eb1a 2 parents 17bdc38 + a75e952
@sgehrig sgehrig authored
View
2  library/Zend/View/Helper/HeadScript.php
@@ -454,7 +454,7 @@ public function toString($indent = null)
: $this->getIndent();
if ($this->view) {
- $useCdata = $this->view->doctype()->isXhtml() ? true : false;
+ $useCdata = $this->view->broker('doctype')->isXhtml() ? true : false;
} else {
$useCdata = $this->useCdata ? true : false;
}
View
6 library/Zend/View/Helper/Navigation.php
@@ -198,15 +198,17 @@ public function findHelper($proxy, $strict = true)
$loader = $this->getPluginLoader();
if ($strict) {
- $helper = $loader->load($proxy);
+ $class = $loader->load($proxy);
} else {
try {
- $helper = $loader->load($proxy);
+ $class = $loader->load($proxy);
} catch (\Zend\Loader\Exception $e) {
return null;
}
}
+ $helper = new $class();
+
if (!$helper instanceof AbstractNavigationHelper) {
if ($strict) {
$e = new \Zend\View\Exception(sprintf(
View
2  library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -679,7 +679,7 @@ public function htmlify(AbstractPage $page)
);
return '<a' . $this->_htmlAttribs($attribs) . '>'
- . $this->view->escape($label)
+ . $this->view->vars()->escape($label)
. '</a>';
}
View
2  library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -205,7 +205,7 @@ public function renderStraight(Container $container = null)
if ($this->getUseTranslator() && $t = $this->getTranslator()) {
$html = $t->translate($html);
}
- $html = $this->view->escape($html);
+ $html = $this->view->vars()->escape($html);
}
// walk back to root
View
8 library/Zend/View/Helper/Navigation/HelperLoader.php
@@ -7,9 +7,9 @@
class HelperLoader extends PluginClassLoader
{
protected $plugins = array(
- 'breadcrumbs' => 'Zend\View\Helper\Navigation\\Breadcrumbs',
- 'links' => 'Zend\View\Helper\Navigation\\Links',
- 'menu' => 'Zend\View\Helper\Navigation\\Menu',
- 'sitemap' => 'Zend\View\Helper\Navigation\\Sitemap',
+ 'breadcrumbs' => 'Zend\View\Helper\Navigation\Breadcrumbs',
+ 'links' => 'Zend\View\Helper\Navigation\Links',
+ 'menu' => 'Zend\View\Helper\Navigation\Menu',
+ 'sitemap' => 'Zend\View\Helper\Navigation\Sitemap',
);
}
View
2  library/Zend/View/Helper/Navigation/Menu.php
@@ -244,7 +244,7 @@ public function htmlify(AbstractPage $page)
}
return '<' . $element . $this->_htmlAttribs($attribs) . '>'
- . $this->view->escape($label)
+ . $this->view->vars()->escape($label)
. '</' . $element . '>';
}
View
4 tests/Zend/View/Helper/Navigation/TestAbstract.php
@@ -98,8 +98,8 @@ protected function setUp()
$this->_nav2 = new Navigation\Navigation($config->get('nav_test2'));
// setup view
- $view = new \Zend\View\View();
- $view->setScriptPath($cwd . '/_files/mvc/views');
+ $view = new \Zend\View\PhpRenderer();
+ $view->resolver()->addPath($cwd . '/_files/mvc/views');
// setup front
$front = Controller\Front::getInstance();
Please sign in to comment.
Something went wrong with that request. Please try again.