mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:50 +01:00
fix for bug #928: Distribution lists are not working with pgsql, thanks to Peter Eisentraut <peter_e-at-gmx.net>
postgres requires that expressions in order by appear in the columns of a distinct select
This commit is contained in:
parent
1be4bf91d1
commit
313edf6eed
@ -328,6 +328,12 @@ class socontacts_sql extends so_sql
|
||||
$filter[] = $this->table_name.'.contact_owner='.(int)$filter['owner'];
|
||||
unset($filter['owner']);
|
||||
}
|
||||
// postgres requires that expressions in order by appear in the columns of a distinct select
|
||||
if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches))
|
||||
{
|
||||
if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
|
||||
$extra_cols[] = $matches[1];
|
||||
}
|
||||
}
|
||||
$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user