L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52355-29' of git://github.com/junpataleta/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2015-12-23 10:06:14 +08:00
parent 81c8f80dae 38b700180f
commit 7dabe1053c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field/date/field.class.php
+14 -3
View File
@@ -44,7 +44,10 @@ class data_field_date extends data_field_base {
$month = $formdata->$fieldname;
$fieldname = 'field_' . $this->field->id . '_year';
$year = $formdata->$fieldname;
$content = make_timestamp($year, $month, $day, 12, 0, 0, 0, false);
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($year, $month, $day);
$content = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'], 12, 0, 0, 0, false);
} else if ($recordid) {
$content = (int)$DB->get_field('data_content', 'content', array('fieldid'=>$this->field->id, 'recordid'=>$recordid));
} else {
@@ -89,7 +92,11 @@ class data_field_date extends data_field_base {
$usedate = optional_param('f_'.$this->field->id.'_z', 0, PARAM_INT);
$data = array();
if (!empty($day) && !empty($month) && !empty($year) && $usedate == 1) {
$data['timestamp'] = make_timestamp($year, $month, $day, 12, 0, 0, 0, false);
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($year, $month, $day);
$data['timestamp'] = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'],
12, 0, 0, 0, false);
$data['usedate'] = 1;
return $data;
} else {
@@ -110,7 +117,11 @@ class data_field_date extends data_field_base {
$content = new stdClass();
$content->fieldid = $this->field->id;
$content->recordid = $recordid;
$content->content = make_timestamp($this->year, $this->month, $this->day, 12, 0, 0, 0, false);
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($this->year, $this->month, $this->day);
$content->content = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'],
12, 0, 0, 0, false);
if ($oldcontent = $DB->get_record('data_content', array('fieldid'=>$this->field->id, 'recordid'=>$recordid))) {
$content->id = $oldcontent->id;