Fixing a couple other issues

cakephp · Dec 31, 2015 · 81278bd · 81278bd
1 parent 9bb3b4c
commit 81278bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/ORM/Association/SelectableAssociationTrait.php b/src/ORM/Association/SelectableAssociationTrait.php
@@ -295,7 +295,8 @@ protected function _resultInjector($fetchQuery, $resultMap, $options)
 
         $sourceKeys = [];
         foreach ((array)$keys as $key) {
-            $sourceKeys[] = key($fetchQuery->aliasField($key, $sAlias));
+            $f = $fetchQuery->aliasField($key, $sAlias);
+            $sourceKeys[] = key($f);
         }
 
         $nestKey = $options['nestKey'];

diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1814,6 +1814,7 @@ protected function _dynamicFinder($method, $args)
             );
         }
 
+        $conditions = [];
         if ($hasOr === false && $hasAnd === false) {
             $conditions = $makeConditions([$fields], $args);
         } elseif ($hasOr !== false) {