Merge pull request #321 from civicrm/5.37

5.37
civicrm · Apr 28, 2021 · 109d876 · 109d876
2 parents edc44b9 + 0ccb91e
commit 109d876
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/DB/DataObject.php b/DB/DataObject.php
@@ -1167,7 +1167,7 @@ function insert()
             }
 
             // CRM-14986 starts
-            if (($v & DB_DATAOBJECT_DATE) || ($v & DB_DATAOBJECT_TIME) || $v & DB_DATAOBJECT_MYSQLTIMESTAMP) {
+            if (($v & DB_DATAOBJECT_DATE) || ($v & DB_DATAOBJECT_TIME) || ($v & DB_DATAOBJECT_MYSQLTIMESTAMP)) {
               if (strpos($this->$k, '-') !== FALSE) {
                 /*
                  * per CRM-14986 we have been having ongoing problems with the format returned from $dao->find(TRUE) NOT
@@ -1183,9 +1183,9 @@ function insert()
             // CRM-14986 ends
 
             // DATE is empty... on a col. that can be null..
-            // note: this may be usefull for time as well..
+            // Also useful for MYSQLTIMESTAMP to stop NO_ZERO_DATE errors
             if (!$this->$k &&
-                    (($v & DB_DATAOBJECT_DATE) || ($v & DB_DATAOBJECT_TIME)) &&
+                    (($v & DB_DATAOBJECT_DATE) || ($v & DB_DATAOBJECT_TIME) || ($v & DB_DATAOBJECT_MYSQLTIMESTAMP)) &&
                     !($v & DB_DATAOBJECT_NOTNULL)) {
 
                 $rightq .= " NULL ";