Doctrine

Timestamp:

04/30/08 19:17:42 (14 months ago)

Author:

jwage

Message:

fixed issue with order in which actAs() tries to find the template for the behavior causing all registered autoloaders to be called every single time.

Files:

• branches/0.11/lib/Doctrine/Record/Abstract.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Record/Abstract.php

@@ -313 +313 @@
     {
         if ( ! is_object($tpl)) {
-            if (class_exists($tpl, true)) {
+            $className = 'Doctrine_Template_' . $tpl;
+
+            if (class_exists($className, true)) {
+                $tpl = new $className($options);
+            } else if (class_exists($tpl, true)) {
                 $tpl = new $tpl($options);
             } else {
-                $className = 'Doctrine_Template_' . $tpl;
-
-                if ( ! class_exists($className, true)) {
-                    throw new Doctrine_Record_Exception("Couldn't load plugin.");
-                }
-
-
-                $tpl = new $className($options);
+                throw new Doctrine_Record_Exception('Could not load behavior named: "' . $tpl . '"');
             }
         }
 
         if ( ! ($tpl instanceof Doctrine_Template)) {
-            throw new Doctrine_Record_Exception('Loaded plugin class is not an istance of Doctrine_Template.');
+            throw new Doctrine_Record_Exception('Loaded behavior class is not an istance of Doctrine_Template.');
         }