Removed duplicate variable

cakephp · Jun 10, 2013 · 331b65d · 331b65d
1 parent 536d2cb
commit 331b65d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/Cake/ORM/Association/BelongsToMany.php b/lib/Cake/ORM/Association/BelongsToMany.php
@@ -235,10 +235,9 @@ protected function _buildQuery($options) {
 
 		if (!empty($options['fields'])) {
 			$fields = $fetchQuery->aliasFields($options['fields'], $alias);
-			$required = $pivotAlias . '.' . $options['foreignKey'];
-			if (!in_array($required, $fields)) {
+			if (!in_array($key, $fields)) {
 				throw new \InvalidArgumentException(
-					sprintf('You are required to select the "%s" field', $required)
+					sprintf('You are required to select the "%s" field', $key)
 				);
 			}
 			$fetchQuery->select($fields);

diff --git a/lib/Cake/ORM/Association/ExternalAssociationTrait.php b/lib/Cake/ORM/Association/ExternalAssociationTrait.php
@@ -179,10 +179,9 @@ protected function _buildQuery($options) {
 
 		if (!empty($options['fields'])) {
 			$fields = $fetchQuery->aliasFields($options['fields'], $alias);
-			$required = $alias . '.' . $options['foreignKey'];
-			if (!in_array($required, $fields)) {
+			if (!in_array($key, $fields)) {
 				throw new \InvalidArgumentException(
-					sprintf('You are required to select the "%s" field', $required)
+					sprintf('You are required to select the "%s" field', $key)
 				);
 			}
 			$fetchQuery->select($fields);