diff options
| author | Louis Chemineau <louis@chmn.me> | 2022-03-31 12:38:26 +0300 |
|---|---|---|
| committer | Louis (Rebase PR Action) <artonge@users.noreply.github.com> | 2022-07-26 15:17:46 +0300 |
| commit | ce7b6ffed2186c6a1a46549669fb1f3cb4451114 (patch) | |
| tree | 618fce1ba8ad07d5e44c1df622ca669d14477d6b /lib/private | |
| parent | 8ca910976d08b1fafc519df90544f775f8bd8c38 (diff) | |
Prevent column name conflict between tables
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 520bd17d3cf..74f3e953a72 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -643,7 +643,10 @@ class DefaultShareProvider implements IShareProvider { public function getSharesInFolder($userId, Folder $node, $reshares) { $qb = $this->dbConn->getQueryBuilder(); - $qb->select('*') + $qb->select('s.*', + 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash', + 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime', + 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum') ->from('share', 's') ->andWhere($qb->expr()->orX( $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), |