Permalink
Browse files

Remove unused variable from the signature.

  • Loading branch information...
1 parent 67a6566 commit e658e071d10daf7af8b70243bd796e643acfabb7 @bar bar committed Nov 12, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/Cake/Model/Datasource/DboSource.php
@@ -1261,7 +1261,7 @@ public function queryAssociation(Model $Model, &$LinkModel, $type, $association,
$this->_filterResults($fetch, $Model);
}
- return $this->_mergeHasMany($resultSet, $fetch, $association, $Model, $LinkModel);
+ return $this->_mergeHasMany($resultSet, $fetch, $association, $Model);
} elseif ($type === 'hasAndBelongsToMany') {
$ins = $fetch = array();
@@ -1396,10 +1396,9 @@ public function fetchAssociated(Model $Model, $query, $ids) {
* @param array $merge Data to merge
* @param string $association Name of Model being Merged
* @param Model $Model Model being merged onto
- * @param Model $LinkModel Model being merged
* @return void
*/
- protected function _mergeHasMany(&$resultSet, $merge, $association, $Model, $LinkModel) {
+ protected function _mergeHasMany(&$resultSet, $merge, $association, $Model) {
$modelAlias = $Model->alias;
$primaryKey = $Model->primaryKey;
$foreignKey = $Model->hasMany[$association]['foreignKey'];

0 comments on commit e658e07

Please sign in to comment.