some fixes

ifacesoft · Mar 24, 2015 · 1a8b622 · 1a8b622
1 parent 7b150b4
commit 1a8b622
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/Source/Ice/Core/Loader.php b/Source/Ice/Core/Loader.php
@@ -66,8 +66,7 @@ public static function load($class, $isRequired = true)
             return true;
         }
 
-        $fileName = self::$_repository->get($class);
-        if ($fileName) {
+        if ($fileName = self::$_repository->get($class)) {
             require_once $fileName;
             return true;
         }

diff --git a/bootstrap.php b/bootstrap.php
@@ -3,13 +3,7 @@
     define('ICE_BOOTSTRAP', true);
 
     if (!defined('VENDOR_DIR')) {
-        $vendorDir = realpath(dirname(__DIR__) . '/_vendor');
-
-        if (!$vendorDir) {
-            die('Vendor dir not found. Please, run \'php composer.phar update --prefer-source\'' . "\n");
-        }
-
-        define('VENDOR_DIR', $vendorDir . '/');
+        die("VENDOR_DIR not defined");
     }
 
     if (!defined('MODULE_DIR')) {