Merge branch 'hotfix/2782'

weierophinney · weierophinney · commit 44bfeb8b0b6a · 2012-10-17T08:43:05.000-05:00
Close zendframework#2782
diff --git a/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -86,7 +86,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             $config = $serviceLocator->get('Config');
             $basePathHelper = new ViewHelper\BasePath;
             if (isset($config['view_manager']) && isset($config['view_manager']['base_path'])) {
-                $basePath = $config['base_path'];
+                $basePath = $config['view_manager']['base_path'];
             } else {
                 $basePath = $serviceLocator->get('Request')->getBasePath();
             }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)`
`86`	`86`	`$config = $serviceLocator->get('Config');`
`87`	`87`	`$basePathHelper = new ViewHelper\BasePath;`
`88`	`88`	`if (isset($config['view_manager']) && isset($config['view_manager']['base_path'])) {`
`89`		`- $basePath = $config['base_path'];`
	`89`	`+ $basePath = $config['view_manager']['base_path'];`
`90`	`90`	`} else {`
`91`	`91`	`$basePath = $serviceLocator->get('Request')->getBasePath();`
`92`	`92`	`}`