Browse Source

Be more semantic indicating that association fields must be empty.

Ber Clausen 12 years ago
parent
commit
8355d32bb1
1 changed files with 3 additions and 3 deletions
  1. 3 3
      lib/Cake/Model/Datasource/DboSource.php

+ 3 - 3
lib/Cake/Model/Datasource/DboSource.php

@@ -1046,11 +1046,11 @@ class DboSource extends DataSource {
 			$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 @@ class DboSource extends DataSource {
 					continue;
 				}
 
-				if ($bypass) {
+				if ($noAssocFields) {
 					$assocData['fields'] = false;
 				}