Fixed SActiveRecord::to_array() (don't return relationships metas)

goldoraf · goldoraf · commit ddd88efecb12 · 2010-10-12T06:41:48.000Z
diff --git a/orm/lib/active_record.php b/orm/lib/active_record.php
@@ -137,7 +137,11 @@ public function __repr()
     
     public function to_array()
     {
-        return $this->values;
+        $values = array();
+        foreach ($this->meta->attributes as $name => $column)
+            if (!array_key_exists($name, $this->meta->relationships))
+                $values[$name] = $this->values[$name];
+        return $values;
     }
     
     public function dump()

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,11 @@ public function __repr()`
`137`	`137`
`138`	`138`	`public function to_array()`
`139`	`139`	`{`
`140`		`- return $this->values;`
	`140`	`+ $values = array();`
	`141`	`+ foreach ($this->meta->attributes as $name => $column)`
	`142`	`+ if (!array_key_exists($name, $this->meta->relationships))`
	`143`	`+ $values[$name] = $this->values[$name];`
	`144`	`+ return $values;`
`141`	`145`	`}`
`142`	`146`
`143`	`147`	`public function dump()`