X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=init_autoloader.php;h=fbce7044533b3f58aa89dd17050088345fd4db9a;hb=aa1c7f5a2437df40f75e7f2ff907c8e314593680;hp=d9f60420af3b98ea669d8c86fa048c992a7c6a48;hpb=55ee5668a858b98ffd0876d3f9895e1f58390472;p=zf2.biz%2Fgalerie.git

diff --git a/init_autoloader.php b/init_autoloader.php
index d9f6042..fbce704 100644
--- a/init_autoloader.php
+++ b/init_autoloader.php
@@ -21,10 +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') ?: (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(