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

Fixing issues with plugin models used in habtm 'with' keys. Fixes #1548

Browse source
This commit is contained in:
mark_story 2011-03-19 08:45:10 -04:00
parent 9ae8dcafdc
commit 6d2b31d4d1
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1959,7 +1959,7 @@ class Model extends Object {
*/
protected function _deleteLinks($id) {
foreach ($this->hasAndBelongsToMany as $assoc => $data) {
$joinModel = $data['with'];
list($plugin, $joinModel) = pluginSplit($data['with']);
$records = $this->{$joinModel}->find('all', array(
'conditions' => array_merge(array($this->{$joinModel}->escapeField($data['foreignKey']) => $id)),
'fields' => $this->{$joinModel}->primaryKey,

17
cake/tests/cases/libs/model/model_delete.test.php
View file

@ -533,6 +533,23 @@ class ModelDeleteTest extends BaseModelTest {
$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
}
/**
* test that a plugin model as the 'with' model doesn't have issues
*
* @return void
*/
function testDeleteLinksWithPLuginJoinModel() {
$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
$Article =& new Article();
$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')), false);
unset($Article->Tag, $Article->ArticleTags);
$Article->bindModel(array('hasAndBelongsToMany' => array(
'Tag' => array('with' => 'TestPlugin.ArticlesTag')
)), false);
$this->assertTrue($Article->delete(1));
}
/**
* test deleteLinks with Multiple habtm associations
*