X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=84f5f903796960206efe27604fb254bdecef7967;hb=4c1704774b146f5827fdf4adcebc7940e9bf07c4;hp=f56f4a61e5914893cf093f2b831c23b70e5d6a1f;hpb=49440e70a33225e071345bf53d8a7471d3997670;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index f56f4a6..84f5f90 100644
--- a/public/index.php
+++ b/public/index.php
@@ -5,6 +5,7 @@ defined('APPLICATION_ENV')
 
 // Ensure ZF is on the include path
 set_include_path(implode(PATH_SEPARATOR, array(
+    realpath(__DIR__ . '/../library'),
     realpath(__DIR__ . '/../library/ZendFramework/library'),
     get_include_path(),
 )));
@@ -12,21 +13,18 @@ set_include_path(implode(PATH_SEPARATOR, array(
 require_once 'Zend/Loader/AutoloaderFactory.php';
 Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
 
-$appConfig = include __DIR__ . '/../configs/application.config.php';
+$appConfig = new Zend\Config\Config(include __DIR__ . '/../configs/application.config.php');
 
-$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig->module_paths);
+$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)
+    $appConfig['modules'],
+    new Zend\Module\ManagerOptions($appConfig['module_manager_options'])
 );
 
-// Get the merged config object
-$config = $moduleManager->getMergedConfig();
-
 // Create application, bootstrap, and run
-$bootstrap = new $config->bootstrap_class($config, $moduleManager);
-$application = new Zend\Mvc\Application;
+$bootstrap      = new Zend\Mvc\Bootstrap($moduleManager);
+$application    = new Zend\Mvc\Application;
 $bootstrap->bootstrap($application);
 $application->run()->send();