extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-30 09:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix SQL error creating or deleting a user when admin accounts list is sorted by ID (account_id)

Browse Source
This commit is contained in:
ralf 2023-06-12 15:22:52 +02:00
parent e2d60bdead
commit 7579b07b42
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,7 +421,7 @@ class Sql extends Api\Storage
); );
$columns = implode(', ', $group); $columns = implode(', ', $group);
if ($this->db->Type == 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0) if (substr($this->db->Type, 0, 5) === 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0)
{ {
$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS '; $mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
} }
@ -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 ($this->db->Type != '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)? *(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();
@ -631,7 +631,7 @@ class Sql extends Api\Storage
{ {
$table = ''; $table = '';
$column = $matches[1]; $column = $matches[1];
if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway if ($column[0] == '#' || $column === 'account_id') continue; // order by custom field is handled in so_sql_cf anyway
if (($key = array_search($column, $this->db_cols)) !== false) $column = $key; if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
if (strpos($column,'.') === false) if (strpos($column,'.') === false)
{ {