X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=init_autoloader.php;h=fbce7044533b3f58aa89dd17050088345fd4db9a;hb=972279db0edd2e87bbb4dde71ed5a091c76e5a3e;hp=c9beed6bb5b9eb33977db670eaa9d4c004cfd430;hpb=4261f12838b8ac6140ecd483e873b3a79a4d1b91;p=zf2.biz%2Fgalerie.git

diff --git a/init_autoloader.php b/init_autoloader.php
index c9beed6..fbce704 100644
--- a/init_autoloader.php
+++ b/init_autoloader.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
 
 /**
  * This autoloading setup is really more complicated than it needs to be for most
@@ -14,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)) {
+$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(