From 05ccf7098d1af9f1210a5627fab3d86f71ba63a9 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 5 Dec 2007 09:50:47 +0000
Subject: [PATCH] Improved autoload.

---
 lib/Doctrine.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine.php b/lib/Doctrine.php
index 1d2170d2c..854075759 100644
--- a/lib/Doctrine.php
+++ b/lib/Doctrine.php
@@ -1010,7 +1010,7 @@ final class Doctrine
      */
     public static function autoload($className)
     {
-        if (class_exists($className, false)) {
+        if (class_exists($className, false) || interface_exists($className, false)) {
             return false;
         }
 
@@ -1021,7 +1021,7 @@ final class Doctrine
         $class = self::$_path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
 
         if (file_exists($class)) {
-            require_once($class);
+            require $class;
 
             return true;
         }
@@ -1029,7 +1029,7 @@ final class Doctrine
         $loadedModels = self::$_loadedModelFiles;
 
         if (isset($loadedModels[$className]) && file_exists($loadedModels[$className])) {
-            require_once($loadedModels[$className]);
+            require_once $loadedModels[$className];
 
             return true;
         }