mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Fixed bad merge on Model::bindModel().
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4390 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
a83f2bf470
commit
67e582cc2f
1 changed files with 4 additions and 2 deletions
|
@ -521,10 +521,12 @@ class Model extends Overloadable {
|
|||
* @param boolean $reset
|
||||
* @return boolean Always true
|
||||
*/
|
||||
function bindModel($params) {
|
||||
function bindModel($params, $reset = true) {
|
||||
|
||||
foreach($params as $assoc => $model) {
|
||||
$this->__backAssociation[$assoc] = $this->{$assoc};
|
||||
if($reset === true) {
|
||||
$this->__backAssociation[$assoc] = $this->{$assoc};
|
||||
}
|
||||
|
||||
foreach($model as $key => $value) {
|
||||
$assocName = $key;
|
||||
|
|
Loading…
Reference in a new issue