Merge pull request #11 from DanielPenkov/master

Retrieve correct versions for entity
josegonzalez · Mar 24, 2016 · 60b817f · 60b817f
2 parents 63006b1 + fa92c18
commit 60b817f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Model/Behavior/Version/VersionTrait.php b/src/Model/Behavior/Version/VersionTrait.php
@@ -36,10 +36,11 @@ public function versions($reset = false)
             return $this->get('_versions');
         }
 
-        $conditions = ['primaryKey' => $this->id];
-
         $table = TableRegistry::get($this->source());
-        $entities = $table->find('versions', $conditions)
+        $primaryKey = $table->primaryKey();
+
+        $conditions = [$primaryKey => $this->id];
+        $entities = $table->find('versions', ['conditions' => $conditions])
                         ->all();
 
         if (empty($entities)) {