Changeset 3207 for trunk/lib/Doctrine.php

Timestamp:

11/23/07 00:25:28 (14 months ago)

Author:

wernerm

Message:

Fixed getLoadedModels()

Files:

• trunk/lib/Doctrine.php (modified) (3 diffs)

trunk/lib/Doctrine.php

@@ -544 +544 @@
 
         foreach ((array) $classes as $name) {
-
             try {
+                $declaredBefore = get_declared_classes();
                 $class = new ReflectionClass($name);
                 if (self::isValidModelClass($class)) {
@@ -555 +555 @@
                 // file is not the same as the actual model file name itself
                 if (isset(self::$_loadedModels[$name])) {
-                    $declaredBefore = get_declared_classes();
                     try {
+                        $tmp = self::$_loadedModels[$name];
                         require_once self::$_loadedModels[$name];
                         $declaredAfter = get_declared_classes();
-                        // Using array_slice since array_diff is broken is some versions
                         $foundClasses = array_slice($declaredAfter, count($declaredBefore)-1);
                         if ($foundClasses) {
@@ -576 +575 @@
 
         }
-
         return $loadedModels;
     }