fixing #2032

kohana · Sep 2, 2009 · f39a11f · f39a11f
1 parent 32ad975
commit f39a11f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/classes/kohana/orm.php b/classes/kohana/orm.php
@@ -887,21 +887,21 @@ public function save_all()
 	 */
 	public function delete($id = NULL)
 	{
-		if ($id !== NULL)
+		if ($id === NULL)
 		{
 			// Use the the primary key value
-			$this->_object[$this->_primary_key] = $id;
+			$id = $this->pk();
 		}
 
-		if ( ! $this->empty_pk())
+		if ( ! empty($id) OR $id === '0')
 		{
-			// Delete this object
+			// Delete the object
 			DB::delete($this->_table_name)
 				->where($this->_primary_key, '=', $id)
 				->execute($this->_db);
 		}
 
-		return $this->clear();
+		return $this;
 	}
 
 	/**