Various clean up

[zf2.biz/galerie.git] / public / index.php

diff --git a/public/index.php b/public/index.php
index cd83a90..84f5f90 100644 (file)
--- 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,7 +13,7 @@ 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->register();
@@ -23,8 +24,7 @@ $moduleManager = new Zend\Module\Manager(
 );
 
 // Create application, bootstrap, and run
-$bootstrapClass = $appConfig['bootstrap_class'];
-$bootstrap      = new $bootstrapClass($moduleManager);
+$bootstrap      = new Zend\Mvc\Bootstrap($moduleManager);
 $application    = new Zend\Mvc\Application;
 $bootstrap->bootstrap($application);
 $application->run()->send();