From e658e071d10daf7af8b70243bd796e643acfabb7 Mon Sep 17 00:00:00 2001
From: Ber Clausen <crashcookie@gmail.com>
Date: Tue, 12 Nov 2013 01:17:11 -0300
Subject: [PATCH] Remove unused variable from the signature.

---
 lib/Cake/Model/Datasource/DboSource.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 6e3f25340..83639f144 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -1261,7 +1261,7 @@ class DboSource extends DataSource {
 				$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 @@ class DboSource extends DataSource {
  * @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'];