maintain ModelAlias.field_name in conditions to avoid ambiguity error.

fahad19 · fahad19 · commit 58f2102ea2a4 · 2014-08-11T11:43:16.000+02:00
diff --git a/Model/Behavior/SearchableBehavior.php b/Model/Behavior/SearchableBehavior.php
@@ -280,7 +280,7 @@ protected function _fillChunk ($Model, $offset, $limit, $id = null) {
 			}
 		} else {
 			if ($id) {
-				$params['conditions'][$Model->primaryKey] = $id;
+				$params['conditions'][$Model->alias . '.' . $Model->primaryKey] = $id;
 			} else {
 				$params['offset'] = $offset;
 				if (empty($params['limit'])) {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ protected function _fillChunk ($Model, $offset, $limit, $id = null) {`
`280`	`280`	`}`
`281`	`281`	`} else {`
`282`	`282`	`if ($id) {`
`283`		`- $params['conditions'][$Model->primaryKey] = $id;`
	`283`	`+ $params['conditions'][$Model->alias . '.' . $Model->primaryKey] = $id;`
`284`	`284`	`} else {`
`285`	`285`	`$params['offset'] = $offset;`
`286`	`286`	`if (empty($params['limit'])) {`