From: Maks Date: Wed, 19 Sep 2012 22:13:39 +0000 (-0700) Subject: Merge pull request #124 from wshafer/master X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=a6cb03ef929b3235f465500df31ed671162c6bb9;hp=b2dec864819049deb3fc935352fca9d0096c131b;p=zf2.biz%2Fapplication_blanche.git Merge pull request #124 from wshafer/master Fix for init_autoloader.php when using composer autoloader --- diff --git a/init_autoloader.php b/init_autoloader.php index 08a0045..fbce704 100644 --- a/init_autoloader.php +++ b/init_autoloader.php @@ -33,7 +33,7 @@ if (getenv('ZF2_PATH')) { // Support for ZF2_PATH environment variable if ($zf2Path) { if (isset($loader)) { - $loader->add('Zend', $zf2Path . '/Zend'); + $loader->add('Zend', $zf2Path); } else { include $zf2Path . '/Zend/Loader/AutoloaderFactory.php'; Zend\Loader\AutoloaderFactory::factory(array(