Merge branch 'MDL-61027-master' of git://github.com/rezaies/moodle

moodle · Feb 5, 2018 · 02e6350 · 02e6350
2 parents 69b4a73 + 4258177
commit 02e6350
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/user/profile/field/datetime/field.class.php b/user/profile/field/datetime/field.class.php
@@ -81,7 +81,8 @@ public function edit_save_data_preprocess($datetime, $datarecord) {
         }
 
         if (is_numeric($datetime)) {
-            $datetime = userdate($datetime, '%Y-%m-%d-%H-%M-%S');
+            $gregoriancalendar = \core_calendar\type_factory::get_calendar_instance('gregorian');
+            $datetime = $gregoriancalendar->timestamp_to_date_string($datetime, '%Y-%m-%d-%H-%M-%S', 99, true, true);
         }
 
         $datetime = explode('-', $datetime);