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

avoid duplication in returned results for habtm

Browse source
This commit is contained in:
Ceeram 2012-08-22 13:03:47 +02:00
parent 88604ac757
commit fb0053753e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Model.php
View file

@ -1755,7 +1755,7 @@ class Model extends Object implements CakeEventListener {
$this->getEventManager()->dispatch($event);
}
if (!empty($this->data)) {
$success = Hash::merge($success, $this->data);
$success = array_merge($success, $this->data);
}
$this->data = false;
$this->_clearCache();

1
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -1170,6 +1170,7 @@ class ModelWriteTest extends BaseModelTest {
$this->assertFalse(empty($result));
$result = $TestModel->save();
$this->assertFalse(empty($result));
$this->assertEquals($data['Tag'], $result['Tag']);
$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
$result = $TestModel->find('first', array('fields' => array('id', 'user_id', 'title', 'body'), 'conditions' => array('Article.id' => 2)));