Merge 3a03377 into a39f97f

josegonzalez · Jul 17, 2019 · a8e2c13 · a8e2c13
2 parents a39f97f + 3a03377
commit a8e2c13
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Model/Behavior/VersionBehavior.php b/src/Model/Behavior/VersionBehavior.php
@@ -234,6 +234,11 @@ public function afterSave(Event $event, EntityInterface $entity)
      */
     public function getVersionId(EntityInterface $entity)
     {
+        $versionField = $this->_config['versionField'];
+        if (!empty($versionField) && in_array($versionField, $this->_table->getSchema()->columns())) {
+            return $entity->get($this->_config['versionField']);
+        }
+
         $table = TableRegistry::get($this->_config['versionTable']);
         $preexistent = $table->find()
             ->select(['version_id'])