mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:04 +01:00
* PostgreSQL/Mail: fix SQL error querying email avatars
This commit is contained in:
parent
6249f128db
commit
f6249e9ad8
@ -623,7 +623,7 @@ class Sql extends Api\Storage
|
||||
}
|
||||
// postgres requires that expressions in order by appear in the columns of a distinct select
|
||||
$all_matches = null;
|
||||
if (substr($this->db->Type, 0, 5) !== 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
|
||||
if (substr($this->db->Type, 0, 5) !== 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL|& *\d+)? *(ASC|DESC)?(,|$)/ui",
|
||||
$order_by, $all_matches, PREG_SET_ORDER))
|
||||
{
|
||||
if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
|
||||
|
Loading…
Reference in New Issue
Block a user