Changeset 262 for trunk/trax/vendor/trax/active_record.php

Timestamp:

09/03/06 20:28:53 (6 years ago)

Author:

john

Message:

composed_of fix in AR

Files:

• trunk/trax/vendor/trax/active_record.php (modified) (3 diffs)

trunk/trax/vendor/trax/active_record.php

@@ -473 +473 @@
                     break;            
             }        
-        } elseif($this->is_composite($key)) {
+        } elseif($this->is_composite($key)) {            
             $composite_object = $this->get_composite_object($key);
             if(is_object($composite_object)) {
@@ -1709 +1709 @@
     private function get_composite_object($name) {
         $composite_object = null;
-        if(is_array($this->composed_of)) {
+        if(is_array($this->composed_of)) { 
             if(array_key_exists($name, $this->composed_of)) {
-                $class_name = Inflector::classify($this->composed_of[$name]['class_name']);
-                if(class_exists($class_name, false)) {
-                    $composite_object = new $class_name;
+                $class_name = Inflector::classify(($this->composed_of[$name]['class_name'] ? 
+                    $this->composed_of[$name]['class_name'] : $name));           
+                if(class_exists($class_name)) {
+                    $composite_object = new $class_name();
                     $mappings = $this->composed_of[$name]['mapping'];
                     if(is_array($mappings)) {
@@ -1724 +1725 @@
         } elseif($this->composed_of == $name) {
             $class_name = Inflector::classify($name);
-            if(class_exists($class_name, false)) {
+            if(class_exists($class_name)) {
                 $composite_object = new $class_name();
                 $composite_object->$name = $this->$name;