adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applying patch from 'ralph.marchildon' Fixes saving habtm data using 'with' data. Fixes #6077

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8021 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2009-02-11 03:53:04 +00:00
parent d3ee6b31f1
commit b1b67c811c
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/model.php
View file

@ -1309,6 +1309,8 @@ class Model extends Overloadable {
unset($values); unset($values);
} elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) { } elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
$newData[] = $row; $newData[] = $row;
} elseif (isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
$newData[] = $row[$join];
} }
} }

6
cake/tests/cases/libs/model/model.test.php
View file

@ -576,6 +576,12 @@ class ModelTest extends CakeTestCase {
'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2')))); 'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2'))));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$expected = $TestModel->findById(1);
$TestModel->set($expected);
$TestModel->save();
$result = $TestModel->findById(1);
$this->assertEqual($result, $expected);
$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false; $TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
$TestModel->create(array( $TestModel->create(array(
'Something' => array('id' => 1), 'Something' => array('id' => 1),