mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46676_master' of https://github.com/ikawhero/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-08-12 01:48:10 +02:00
commit 27e7715141
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
user/profile/field/datetime/field.class.php
View File

@ -79,7 +79,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);
@ -110,4 +110,4 @@ class profile_field_datetime extends profile_field_base {
return userdate($this->data, $format);
}
}
}
}