Merge branch 'hotfix/viewhelpermanager-undefinedindex' of git://githu…

…b.com/coss/zf2 into hotfix/2778
akandels · Oct 16, 2012 · 2e28c87 · 2e28c87
2 parents fc4daae + a4cb964
commit 2e28c87
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -84,9 +84,8 @@ public function createService(ServiceLocatorInterface $serviceLocator)
 
         $plugins->setFactory('basepath', function($sm) use($serviceLocator) {
             $config = $serviceLocator->get('Config');
-            $config = $config['view_manager'];
             $basePathHelper = new ViewHelper\BasePath;
-            if (isset($config['base_path'])) {
+            if (isset($config['view_manager']) && isset($config['view_manager']['base_path'])) {
                 $basePath = $config['base_path'];
             } else {
                 $basePath = $serviceLocator->get('Request')->getBasePath();