Fix additional data coming from right table.

josegonzalez · Mar 26, 2017 · d1022ad · d1022ad
1 parent 3c69b8e
commit d1022ad
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Model/Behavior/VersionBehavior.php b/src/Model/Behavior/VersionBehavior.php
@@ -294,11 +294,15 @@ public function groupVersions($results)
                 $versionData = [
                     $versionField => $versionId
                 ];
+
+                /* @var \Cake\Datasource\EntityInterface $versionRow */
+                $versionRow = $grouped->match(['version_id' => $versionId])->first();
+
                 foreach ($this->_config['additionalVersionFields'] as $mappedField => $field) {
                     if (!is_string($mappedField)) {
                         $mappedField = 'version_' . $field;
                     }
-                    $versionData[$mappedField] = $row->get($field);
+                    $versionData[$mappedField] = $versionRow->get($field);
                 }
 
                 $version = new $entityClass($keys + $versionData, [