adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused variable from the signature.

Browse source
This commit is contained in:
Ber Clausen 2013-11-12 01:17:11 -03:00
parent 67a65663a7
commit e658e071d1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1261,7 +1261,7 @@ class DboSource extends DataSource {
$this->_filterResults($fetch, $Model); $this->_filterResults($fetch, $Model);
} }
return $this->_mergeHasMany($resultSet, $fetch, $association, $Model, $LinkModel); return $this->_mergeHasMany($resultSet, $fetch, $association, $Model);
} elseif ($type === 'hasAndBelongsToMany') { } elseif ($type === 'hasAndBelongsToMany') {
$ins = $fetch = array(); $ins = $fetch = array();
@ -1396,10 +1396,9 @@ class DboSource extends DataSource {
* @param array $merge Data to merge * @param array $merge Data to merge
* @param string $association Name of Model being Merged * @param string $association Name of Model being Merged
* @param Model $Model Model being merged onto * @param Model $Model Model being merged onto
* @param Model $LinkModel Model being merged
* @return void * @return void
*/ */
protected function _mergeHasMany(&$resultSet, $merge, $association, $Model, $LinkModel) { protected function _mergeHasMany(&$resultSet, $merge, $association, $Model) {
$modelAlias = $Model->alias; $modelAlias = $Model->alias;
$primaryKey = $Model->primaryKey; $primaryKey = $Model->primaryKey;
$foreignKey = $Model->hasMany[$association]['foreignKey']; $foreignKey = $Model->hasMany[$association]['foreignKey'];