From 1ddf6ffbb6852291e5dd6569dddfb29afd82b252 Mon Sep 17 00:00:00 2001
From: gamonoid <contact@gamonoid.com>
Date: Sun, 26 Nov 2017 20:47:39 +0100
Subject: [PATCH] Fix issue: custom fields not getting saved in mysql v5.7

---
 src/Classes/CustomFieldManager.php | 12 +++++++++---
 src/Model/BaseModel.php            |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Classes/CustomFieldManager.php b/src/Classes/CustomFieldManager.php
index b68463c3..21b879cb 100644
--- a/src/Classes/CustomFieldManager.php
+++ b/src/Classes/CustomFieldManager.php
@@ -9,6 +9,7 @@
 namespace Classes;
 
 use Metadata\Common\Model\CustomFieldValue;
+use Utils\LogManager;
 
 class CustomFieldManager
 {
@@ -28,12 +29,17 @@ class CustomFieldManager
             $customFieldValue->name = $name;
             $customFieldValue->object_id = $id;
             $customFieldValue->type = $type;
-            $customFieldValue->created = date("Y-md-d H:i:s");
+            $customFieldValue->created = date("Y-m-d H:i:s");
         }
 
         $customFieldValue->value = $value;
-        $customFieldValue->updated = date("Y-md-d H:i:s");
-        $customFieldValue->Save();
+        $customFieldValue->updated = date("Y-m-d H:i:s");
+        $ok = $customFieldValue->Save();
+        if (!$ok) {
+            LogManager::getInstance()->error("Error saving custom field: " . $customFieldValue->ErrorMsg());
+            return false;
+        }
+        return true;
     }
 
     public function getCustomFields($type, $id)
diff --git a/src/Model/BaseModel.php b/src/Model/BaseModel.php
index f5b168ad..b234bdf2 100644
--- a/src/Model/BaseModel.php
+++ b/src/Model/BaseModel.php
@@ -154,7 +154,7 @@ class BaseModel extends \ADOdb_Active_Record
                 continue;
             }
 
-            $keys[$k] = $k;
+            $keys[$k] = $v;
         }
 
         return $keys;