Be more semantic indicating that association fields must be empty.

cakephp · Dec 21, 2013 · 8355d32 · 8355d32
1 parent 99c8503
commit 8355d32
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -1046,11 +1046,11 @@ public function read(Model $Model, $queryData = array(), $recursive = null) {
 			$Model->recursive = $recursive;
 		}
 
-		$bypass = false;
 		if (!empty($queryData['fields'])) {
-			$bypass = true;
+			$noAssocFields = true;
 			$queryData['fields'] = $this->fields($Model, null, $queryData['fields']);
 		} else {
+			$noAssocFields = false;
 			$queryData['fields'] = $this->fields($Model);
 		}
 
@@ -1076,7 +1076,7 @@ public function read(Model $Model, $queryData = array(), $recursive = null) {
 					continue;
 				}
 
-				if ($bypass) {
+				if ($noAssocFields) {
 					$assocData['fields'] = false;
 				}