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

Satisfy postgres about integer not comparable to varchar

Browse Source
This commit is contained in:
Hadi Nategh 2017-03-20 18:06:00 +01:00
parent d34917f056
commit a71f8e22ad
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -893,7 +893,9 @@ class calendar_so
{ {
$order = ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'] == 'lastname' ? 'n_family' : 'n_fileas'); $order = ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'] == 'lastname' ? 'n_family' : 'n_fileas');
$cols .= ",egw_addressbook.{$order}"; $cols .= ",egw_addressbook.{$order}";
$join .= "LEFT JOIN egw_addressbook ON egw_addressbook.account_id = {$this->user_table}.cal_user_id"; $join .= "LEFT JOIN egw_addressbook ON ".
($this->db->Type == 'pgsql'? "egw_addressbook.account_id::varchar = ":"egw_addressbook.account_id = ").
"{$this->user_table}.cal_user_id";
$params['order'] = "$order, cal_non_blocking DESC"; $params['order'] = "$order, cal_non_blocking DESC";
} }
else if ($params['order'] == 'categories , cal_non_blocking DESC') else if ($params['order'] == 'categories , cal_non_blocking DESC')