From 2e0ec28018c62c9684c65ed3c5deb0e77b04b34d Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 23 Nov 2006 11:05:47 +0000
Subject: [PATCH] Fix for Ticket #1689.

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

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 34507b05c..9c5bbeec0 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1159,17 +1159,17 @@ class Model extends Overloadable {
  * @access protected
  */
 	function _deleteHasMany($id, $cascade) {
-		$records = array();
-
 		foreach($this->hasMany as $assoc => $data) {
 			if ($data['dependent'] === true && $cascade === true) {
 				$model =& $this->{$data['className']};
 				$field = $model->escapeField($data['foreignKey']);
 				$model->recursive = 0;
-				$records        = $model->findAll("$field = '$id'", $model->primaryKey, null, null);
+				$records = $model->findAll("$field = '$id'", $model->primaryKey, null, null);
 
-				foreach($records as $record) {
-					$model->del($record[$data['className']][$model->primaryKey]);
+				if($records != false){
+					foreach($records as $record) {
+						$model->del($record[$data['className']][$model->primaryKey]);
+					}
 				}
 			}
 		}
@@ -1182,8 +1182,6 @@ class Model extends Overloadable {
  * @access protected
  */
 	function _deleteHasOne($id, $cascade) {
-		$records = array();
-
 		foreach($this->hasOne as $assoc => $data) {
 			if ($data['dependent'] === true && $cascade === true) {
 				$model =& $this->{$data['className']};
@@ -1191,8 +1189,10 @@ class Model extends Overloadable {
 				$model->recursive = 0;
 				$records = $model->findAll("$field = '$id'", $model->primaryKey, null, null);
 
-				foreach($records as $record) {
-					$model->del($record[$data['className']][$model->primaryKey]);
+				if($records != false){
+					foreach($records as $record) {
+						$model->del($record[$data['className']][$model->primaryKey]);
+					}
 				}
 			}
 		}