From: YonmaN <yonmanm@gmail.com>
Date: Mon, 3 Sep 2012 12:04:56 +0000 (+0300)
Subject: Update init_autoloader.php
X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fapplication_blanche.git;a=commitdiff_plain;h=4a4dabcc87d6419aed060b8f12c01d42eb6e37dc

Update init_autoloader.php

Gah, original code was wrong and obfuscated
---

diff --git a/init_autoloader.php b/init_autoloader.php
index 5552eea..b2a361d 100644
--- a/init_autoloader.php
+++ b/init_autoloader.php
@@ -21,11 +21,17 @@ 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');
     } else {