From dedb404423bcfc0b2ec743ae83ee728b84172869 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Wed, 1 Nov 2006 20:31:45 +0000
Subject: [PATCH] Merging fixes for associations to 1.1.x.x branch Removed
 commented code from Model::_ _generateAssociation() in 1.2.x.x

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

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 0a4d5195f..246bb0109 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -603,10 +603,6 @@ class Model extends Overloadable {
 		foreach($this->{$type} as $assocKey => $assocData) {
 			$class = $assocKey;
 
-			//if (isset($this->{$type}[$assocKey]['className']) && $this->{$type}[$assocKey]['className'] !== null) {
-			//	$class = $this->{$type}[$assocKey]['className'];
-			//}
-
 			foreach($this->__associationKeys[$type] as $key) {
 				if (!isset($this->{$type}[$assocKey][$key]) || $this->{$type}[$assocKey][$key] == null) {
 					$data = '';