X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=modules%2FApplication%2FModule.php;h=37cb11fd1f76548100e24046171b85471c428e9c;hb=bb0d0604ab23ce6ef620755f8923ede273b04267;hp=9dee84c8687de0ba547e2ea8e1a0b3e06d4dfeec;hpb=c98ce242fea38efa5abfa940202b55747fbed7a9;p=zf2.biz%2Fgalerie.git diff --git a/modules/Application/Module.php b/modules/Application/Module.php index 9dee84c..37cb11f 100644 --- a/modules/Application/Module.php +++ b/modules/Application/Module.php @@ -3,7 +3,6 @@ namespace Application; use Zend\Module\Manager, - Zend\Config\Config, Zend\EventManager\StaticEventManager, Zend\Loader\AutoloaderFactory; @@ -14,12 +13,12 @@ class Module public function init(Manager $moduleManager) { - $this->initAutoloader($moduleManager->getOptions()->getApplicationEnv()); + $this->initAutoloader(); $events = StaticEventManager::getInstance(); $events->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100); } - protected function initAutoloader($env = null) + protected function initAutoloader() { AutoloaderFactory::factory(array( 'Zend\Loader\ClassMapAutoloader' => array( @@ -33,9 +32,9 @@ class Module )); } - public function getConfig() + public function getConfig($env = null) { - return new Config(include __DIR__ . '/configs/module.config.php'); + return include __DIR__ . '/configs/module.config.php'; } public function initializeView($e)