From 2fa2de441f7267cf15dd42b2274fcf76c2eaed19 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 5 Oct 2011 22:10:14 -0400
Subject: [PATCH] Updating the doc block for Datasource::delete() Fixes #2054

---
 cake/libs/model/datasources/datasource.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 086905fbdfa..7e3aff63ceb 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -375,13 +375,11 @@ function update(&$model, $fields = null, $values = null) {
  * To-be-overridden in subclasses.
  *
  * @param Model $model The model class having record(s) deleted
- * @param mixed $id Primary key of the model
+ * @param mixed $conditions The conditions to use for deleting.
  * @access public
  */
-	function delete(&$model, $id = null) {
-		if ($id == null) {
-			$id = $model->id;
-		}
+	function delete(&$model, $conditions = null) {
+		return false;
 	}
 
 /**