From 5a944734b8261079bb83d1b8b6dce1b6276e3c57 Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 12 Mar 2014 23:30:46 -0400 Subject: [PATCH] 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. --- lib/Cake/Model/Datasource/DboSource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index d6c019f50..4be0d74d2 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -1641,7 +1641,7 @@ class DboSource extends DataSource { * 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'])) {