Merge branch 'MDL-46676_2.6' of https://github.com/ikawhero/moodle into MOODLE_26_STABLE

user/profile/field/datetime/field.class.php

@@ -72,7 +72,7 @@ class profile_field_datetime extends profile_field_base {
         // If timestamp then explode it to check if year is within field limit.
         $isstring = strpos($datetime, '-');
         if (empty($isstring)) {
-            $datetime = date('Y-m-d-H-i-s', $datetime);
+            $datetime = userdate($datetime, '%Y-%m-%d-%H-%M-%S');
         }
 
         $datetime = explode('-', $datetime);
@@ -103,4 +103,4 @@ class profile_field_datetime extends profile_field_base {
             return userdate($this->data, $format);
         }
     }
-}
+}