Improved BaseModel with date timezone support

someline · Sep 17, 2016 · b3ec0f6 · b3ec0f6
1 parent 141871c
commit b3ec0f6
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Someline/Base/Models/BaseModel.php b/src/Someline/Base/Models/BaseModel.php
@@ -229,12 +229,14 @@ protected function getAuthUserDateTimezone()
      */
     public function setAttribute($key, $value)
     {
-        if ($value && (in_array($key, $this->getDates()) || $this->isDateCastable($key))) {
-            $value = $this->fromDateTime($value);
-        }
 
-        if ($value instanceof Carbon && $this->timestamp_always_save_in_utc) {
-            $value->setTimezone('UTC');
+        if ($this->timestamp_always_save_in_utc) {
+            if ($value instanceof Carbon) {
+                $value->setTimezone('UTC');
+            } else if ($value && (in_array($key, $this->getDates()) || $this->isDateCastable($key))) {
+                $value = $this->fromDateTime($value);
+                $value->setTimezone('UTC');
+            }
         }
 
         return parent::setAttribute($key, $value);