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

David Monllao · David Monllao · commit 02e6350222aa · 2018-02-05T11:56:18.000+01:00
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);

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public function edit_save_data_preprocess($datetime, $datarecord) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (is_numeric($datetime)) {`
`84`		`- $datetime = userdate($datetime, '%Y-%m-%d-%H-%M-%S');`
	`84`	`+ $gregoriancalendar = \core_calendar\type_factory::get_calendar_instance('gregorian');`
	`85`	`+ $datetime = $gregoriancalendar->timestamp_to_date_string($datetime, '%Y-%m-%d-%H-%M-%S', 99, true, true);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`$datetime = explode('-', $datetime);`