holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar - cast cal_id to varchar in sort too to avoid PostgreSQL error

Browse Source
This commit is contained in:
nathangray 2019-06-05 14:34:42 -06:00
parent db0ae59fa4
commit 9602106512
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_so.inc.php
View File

@ -367,7 +367,7 @@ class calendar_so
$cols .= ',range_end-1 AS recur_enddate'; $cols .= ',range_end-1 AS recur_enddate';
// sort deleted to the end, to prefer non-deleted events over deleted ones when querying by uid // sort deleted to the end, to prefer non-deleted events over deleted ones when querying by uid
$group_by .= ' ORDER BY cal_deleted IS NOT NULL,egw_cal.cal_id DESC'; $group_by .= ' ORDER BY cal_deleted IS NOT NULL,' . $this->db->to_varchar($this->cal_table.'.cal_id') . ' DESC';
$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date); $events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);