adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

closes #5968, refs #5798, reverts [7893], when dependent is true, conditions are not respected on HABTM associations when deleting parent record. [7893] would result in orphaned records. If more fine grained control is needed, create a model for the join table and handle it on an application/applicaiton basis.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7988 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-01-14 22:01:01 +00:00
parent 7c87d36d74
commit c53c28760f
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1759,7 +1759,7 @@ class Model extends Overloadable {
foreach ($this->hasAndBelongsToMany as $assoc => $data) {
$records = $this->{$data['with']}->find('all', array(
'conditions' => array_merge(array($data['foreignKey'] => $id), (array) $data['conditions']),
'conditions' => array_merge(array($this->{$data['with']}->escapeField($data['foreignKey']) => $id)),
'fields' => $this->{$data['with']}->primaryKey,
'recursive' => -1
));

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

@ -6370,10 +6370,7 @@ class ModelTest extends CakeTestCase {
$this->assertFalse($result);
$result = $Portfolio->ItemsPortfolio->find('all', array('conditions' => array('ItemsPortfolio.portfolio_id' => 1)));
$expected = array(
array('ItemsPortfolio' => array('id' => 1, 'item_id' => 1, 'portfolio_id' => 1))
);
$this->assertEqual($result, $expected);
$this->assertFalse($result);
}
function testDeleteArticleBLinks() {