Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Remove typehint on $LinkModel argument.

Adding a typehint here causes errors in a few userland plugins. We
should honor the previous interface as best we can.
  • Loading branch information...
1 parent 0d4a6e3 commit 5a944734b8261079bb83d1b8b6dce1b6276e3c57 @markstory markstory committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/Cake/Model/Datasource/DboSource.php
2  lib/Cake/Model/Datasource/DboSource.php
@@ -1641,7 +1641,7 @@ public function buildAssociationQuery(Model $Model, $queryData) {
* String representing a query.
* True, when $external is false and association $type is 'hasOne' or 'belongsTo'.
- public function generateAssociationQuery(Model $Model, Model $LinkModel, $type, $association, $assocData, &$queryData, $external) {
+ public function generateAssociationQuery(Model $Model, $LinkModel, $type, $association, $assocData, &$queryData, $external) {
$assocData = $this->_scrubQueryData($assocData);
if ($external && !empty($assocData['finderQuery'])) {

0 comments on commit 5a94473

Please sign in to comment.
Something went wrong with that request. Please try again.