Fixed issue: datefield from mssql database always contains milliseconds

LimeSurvey · Oct 23, 2018 · 1c0bc38 · 1c0bc38
1 parent 8d46780
commit 1c0bc38
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -629,7 +629,10 @@ public function editdata($subaction, $id, $surveyid)
                         case "D": //DATE
                             $dateformatdetails = getDateFormatDataForQID($qidattributes, $surveyid);
                             if ($idrow[$fname['fieldname']] != '') {
-                                $datetimeobj = DateTime::createFromFormat("!Y-m-d H:i:s", $idrow[$fname['fieldname']]);
+                                $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s", $idrow[$fname['fieldname']]);
+                                if($datetimeobj == null) { //MSSQL uses microseconds by default in any datetime object
+                                    $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s.u", $idrow[$fname['fieldname']]);
+                                }
                                 $thisdate = $datetimeobj->format($dateformatdetails['phpdate']);
                             } else {
                                 $thisdate = '';