X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=init_autoloader.php;h=fbce7044533b3f58aa89dd17050088345fd4db9a;hb=a00c1c030c3c6e7d2415e0bb7adb88917f9b564f;hp=5552eea8b164f83bcf6c5adadc957c341f72f4c3;hpb=36f90f983b2e4aba259b9718517a45ca8f5b2e08;p=zf2.biz%2Fgalerie.git

diff --git a/init_autoloader.php b/init_autoloader.php
index 5552eea..fbce704 100644
--- a/init_autoloader.php
+++ b/init_autoloader.php
@@ -21,13 +21,19 @@ if (file_exists('vendor/autoload.php')) {
     $loader = include 'vendor/autoload.php';
 }
 
-// Support for ZF2_PATH environment variable or git submodule
-if (($zf2Path = getenv('ZF2_PATH') ?: 
-    // Support for zf2_path ini directive
-    (get_cfg_var('zf2_path') ?: 
-        (is_dir('vendor/ZF2/library') ? 'vendor/ZF2/library' : false)) !== false)) {
+$zf2Path = false;
+
+if (getenv('ZF2_PATH')) {           // Support for ZF2_PATH environment variable or git submodule
+    $zf2Path = getenv('ZF2_PATH');
+} elseif (get_cfg_var('zf2_path')) { // Support for zf2_path directive value
+    $zf2Path = get_cfg_var('zf2_path');
+} elseif (is_dir('vendor/ZF2/library')) {
+    $zf2Path = 'vendor/ZF2/library';
+}
+
+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(