Merge pull request #253 from samsonasik/autoload-checkmoved

move class_exists(ZendLoaderAutoloaderFactory) before $zf2Path check based on #248

Author: Ocramius

init_autoloader.php

@@ -21,6 +21,10 @@
     $loader = include 'vendor/autoload.php';
 }
 
+if (class_exists('Zend\Loader\AutoloaderFactory')) {
+    return;
+}
+
 $zf2Path = false;
 
 if (is_dir('vendor/ZF2/library')) {
@@ -31,7 +35,7 @@
     $zf2Path = get_cfg_var('zf2_path');
 }
 
-if ($zf2Path && !class_exists('Zend\Loader\AutoloaderFactory')) {
+if ($zf2Path) {
     if (isset($loader)) {
         $loader->add('Zend', $zf2Path);
         $loader->add('ZendXml', $zf2Path);