Making target alias more extensible

cakephp · Jun 24, 2015 · 2238303 · 2238303
1 parent 44fbc41
commit 2238303
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -287,6 +287,7 @@ protected function _belongsToMany(Association $assoc, array $data, $options = []
         $records = [];
         $conditions = [];
         $primaryCount = count($primaryKey);
+        $target = $assoc->target();
 
         foreach ($data as $i => $row) {
             if (!is_array($row)) {
@@ -296,7 +297,7 @@ protected function _belongsToMany(Association $assoc, array $data, $options = []
                 $keys = array_intersect_key($row, $primaryKey);
                 if (count($keys) === $primaryCount) {
                     foreach ($keys as $key => $value) {
-                        $conditions[][$assoc->alias() . '.' . $key] = $value;
+                        $conditions[][$target->aliasfield($key)] = $value;
                     }
                 }
             } else {