adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-06-02 04:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source
This commit is contained in:
mark_story 2012-09-28 21:20:24 -04:00
commit 59e948fb1b
9 changed files with 76 additions and 44 deletions
lib/Cake/Model
Model.php

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

@ -3261,7 +3261,7 @@ class Model extends Object implements CakeEventListener {
return array($with, array_unique(array_merge($assoc[$with], $keys)));
}
trigger_error(
__d('cake_dev', 'Invalid join model settings in %s', $model->alias),
__d('cake_dev', 'Invalid join model settings in %s. The association parameter has the wrong type, expecting a string or array, but was passed type: %s', $this->alias, gettype($assoc)),
E_USER_WARNING
);
}