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

2018-02-05 11:56:18 +01:00
parent 69b4a73de8 425817793a
commit 02e6350222
1 changed files with 2 additions and 1 deletions
@@ -81,7 +81,8 @@ class profile_field_datetime extends profile_field_base {
        }

        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);