The foreign key in the belongs_to relationship is now only set to the…

… value's primary key if the value is an instance of ORM, otherwise the foreign key is set to NULL. Fixes #4420
kohana · Jan 28, 2012 · b577bae · b577bae
1 parent bc56b3d
commit b577bae
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/classes/kohana/orm.php b/classes/kohana/orm.php
@@ -678,7 +678,9 @@ public function set($column, $value)
 			$this->_related[$column] = $value;
 
 			// Update the foreign key of this model
-			$this->_object[$this->_belongs_to[$column]['foreign_key']] = $value->pk();
+			$this->_object[$this->_belongs_to[$column]['foreign_key']] = ($value instanceof ORM)
+				? $value->pk()
+				: NULL;
 
 			$this->_changed[$column] = $this->_belongs_to[$column]['foreign_key'];
 		}