From 1a8b622d4bc64b266236d991404d23a5177c3073 Mon Sep 17 00:00:00 2001
From: dp <dp@lab.ifacesoft.ru>
Date: Tue, 24 Mar 2015 23:51:51 +0300
Subject: [PATCH] some fixes

---
 Source/Ice/Core/Loader.php | 3 +--
 bootstrap.php              | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Source/Ice/Core/Loader.php b/Source/Ice/Core/Loader.php
index 9365ed5a..67f7a91d 100644
--- 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
index b3b96080..8ffc1d51 100644
--- 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')) {