X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=9c388bef43491949dcb20255d8ca971669a12f17;hb=74baee4e631ade81b0170cd0cfe73fe31e94b96b;hp=5c4778d550436fdeeb16be58d54ff3c69cc6ad23;hpb=d43b616060673ff50933311b813bf93fd6e8d96e;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index 5c4778d..9c388be 100644
--- a/public/index.php
+++ b/public/index.php
@@ -18,13 +18,13 @@ $appConfig = include __DIR__ . '/../configs/application.config.php';
 $moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig['module_paths']);
 $moduleLoader->register();
 
-$moduleManager = new Zend\Module\Manager(
-    $appConfig['modules'],
-    new Zend\Module\ManagerOptions($appConfig['module_manager_options'])
-);
+$moduleManager = new Zend\Module\Manager($appConfig['modules']);
+$listenerOptions = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
+$moduleManager->setDefaultListenerOptions($listenerOptions);
+$moduleManager->loadModules();
 
 // Create application, bootstrap, and run
-$bootstrap      = new Zend\Mvc\Bootstrap($moduleManager);
+$bootstrap      = new Zend\Mvc\Bootstrap($moduleManager->getMergedConfig());
 $application    = new Zend\Mvc\Application;
 $bootstrap->bootstrap($application);
 $application->run()->send();