mirror of
https://github.com/moodle/moodle.git
synced 2025-04-16 05:54:19 +02:00
Merge branch 'MDL-43887-master' of git://github.com/cameron1729/moodle
This commit is contained in:
commit
3300393d05
@ -76,15 +76,18 @@ class profile_field_datetime extends profile_field_base {
|
||||
* @since Moodle 2.5
|
||||
*/
|
||||
public function edit_save_data_preprocess($datetime, $datarecord) {
|
||||
// If timestamp then explode it to check if year is within field limit.
|
||||
$isstring = strpos($datetime, '-');
|
||||
if (empty($isstring)) {
|
||||
if (!$datetime) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (is_numeric($datetime)) {
|
||||
$datetime = userdate($datetime, '%Y-%m-%d-%H-%M-%S');
|
||||
}
|
||||
|
||||
$datetime = explode('-', $datetime);
|
||||
// Bound year with start and end year.
|
||||
$datetime[0] = min(max($datetime[0], $this->field->param1), $this->field->param2);
|
||||
|
||||
if (!empty($this->field->param3) && count($datetime) == 6) {
|
||||
return make_timestamp($datetime[0], $datetime[1], $datetime[2], $datetime[3], $datetime[4], $datetime[5]);
|
||||
} else {
|
||||
@ -110,4 +113,13 @@ class profile_field_datetime extends profile_field_base {
|
||||
return userdate($this->data, $format);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the field data is considered empty
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function is_empty() {
|
||||
return empty($this->data);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user