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

* PostgreSQL/Addressbook/All Apps: fix SQL error in history tab if there are attachments

Browse Source
This commit is contained in:
Ralf Becker 2021-09-03 09:48:24 +02:00
parent 9cee681b94
commit a566599b7f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Storage/History.php
View File

@ -308,7 +308,7 @@ class History
$_query[] = array( $_query[] = array(
'table' => Api\Vfs\Sqlfs\StreamWrapper::TABLE, 'table' => Api\Vfs\Sqlfs\StreamWrapper::TABLE,
'cols' => array('fs_id', 'fs_dir', "'filemanager'", 'COALESCE(fs_modifier,fs_creator)', "'~file~'", 'cols' => array('fs_id', 'fs_dir', "'filemanager'", 'COALESCE(fs_modifier,fs_creator)', "'~file~'",
'fs_name', 'fs_modified', 'fs_mime', '"" AS share_email'), 'fs_name', 'fs_modified', 'fs_mime', "'' AS share_email"),
'where' => array('fs_dir' => $file['ino']) 'where' => array('fs_dir' => $file['ino'])
); );
} }
@ -316,7 +316,8 @@ class History
foreach($GLOBALS['egw']->db->union( foreach($GLOBALS['egw']->db->union(
$_query, $_query,
__LINE__, __FILE__, __LINE__, __FILE__,
' ORDER BY ' . ($query['order'] ? $query['order'] : 'history_timestamp') . ' ' . ($query['sort'] ? $query['sort'] : 'DESC'), preg_match('/^(([a-z0-9_]+) (ASC|DESC),?)+$/', $query['order'].' '.($query['sort'] ?: 'DESC')) ?
' ORDER BY ' . $query['order'] . ' ' . ($query['sort'] ?: 'DESC') : ' ORDER BY history_timestamp DESC,history_id ASC',
$query['start'], $query['start'],
$query['num_rows'] $query['num_rows']
) as $row) ) as $row)