From b5face3516cd8f9b0f73053137b6ecaffbc78a69 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Wed, 13 Dec 2006 04:04:15 +0000
Subject: [PATCH] Changing Model::del to check for existence of itself before
 allowing deletes

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4099 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/model.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 2976e0d09..5d3137d6e 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1126,19 +1126,17 @@ class Model extends Overloadable {
  * @return boolean True on success
  */
 	function del($id = null, $cascade = true) {
-		if ($id) {
+		if (!empty($id)) {
 			$this->id = $id;
 		}
 
-		$id = $this->id;
-
-		if ($this->beforeDelete()) {
+		if ($this->exists() && $this->beforeDelete()) {
 			$db =& ConnectionManager::getDataSource($this->useDbConfig);
 
 			if ($this->id && $db->delete($this)) {
-				$this->_deleteMulti($id);
-				$this->_deleteHasMany($id, $cascade);
-				$this->_deleteHasOne($id, $cascade);
+				$this->_deleteMulti($this->id);
+				$this->_deleteHasMany($this->id, $cascade);
+				$this->_deleteHasOne($this->id, $cascade);
 				$this->afterDelete();
 				$this->_clearCache();
 				$this->id = false;