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
This commit is contained in:
phpnut 2006-11-01 20:31:45 +00:00
parent 708dc77ae8
commit dedb404423

View file

@ -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 = '';