extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 18:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

* PostgreSQL/Mail: fix SQL error querying email avatars

Browse Source
This commit is contained in:
ralf 2023-08-02 11:50:09 +02:00
parent 6249f128db
commit f6249e9ad8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Contacts/Sql.php
View File

@ -623,7 +623,7 @@ class Sql extends Api\Storage
} }
// postgres requires that expressions in order by appear in the columns of a distinct select // postgres requires that expressions in order by appear in the columns of a distinct select
$all_matches = null; $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)) $order_by, $all_matches, PREG_SET_ORDER))
{ {
if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array(); if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();