Merge pull request #52 from radsystems/3.2/develop

Fixes #4420 - ORM belongs_to relationships can now be set to NULL
kohana · Jul 26, 2012 · 4af8c37 · 4af8c37
2 parents 9b181f6 + b577bae
commit 4af8c37
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/classes/kohana/orm.php b/classes/kohana/orm.php
@@ -681,7 +681,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'];
 		}