mirror of https://github.com/nextcloud/bookmarks
Fix tag filtering
This commit is contained in:
parent
e391da95c3
commit
622103eb09
|
@ -250,8 +250,8 @@ class BookmarkMapper extends QBMapper {
|
|||
$qb
|
||||
->from('bookmarks', 'b')
|
||||
->leftJoin('b', 'bookmarks_tags', 't', $qb->expr()->eq('t.bookmark_id', 'b.id'))
|
||||
->innerJoin('b', 'bookmarks_tree', 'tr', $qb->expr()->eq('tr.id', 'b.id'))
|
||||
->innerJoin('tr', 'bookmarks_shared_folders', 'sf', $qb->expr()->eq('tr.parent_folder', 'sf.folder_id'))
|
||||
->leftJoin('b', 'bookmarks_tree', 'tr', $qb->expr()->eq('tr.id', 'b.id'))
|
||||
->leftJoin('tr', 'bookmarks_shared_folders', 'sf', $qb->expr()->eq('tr.parent_folder', 'sf.folder_id'))
|
||||
->where($qb->expr()->orX(
|
||||
$qb->expr()->eq('b.user_id', $qb->createPositionalParameter($userId)),
|
||||
$qb->expr()->eq('sf.user_id', $qb->createPositionalParameter($userId))
|
||||
|
@ -272,8 +272,8 @@ class BookmarkMapper extends QBMapper {
|
|||
$qb
|
||||
->from('bookmarks', 'b')
|
||||
->leftJoin('b', 'bookmarks_tags', 't', $qb->expr()->eq('t.bookmark_id', 'b.id'))
|
||||
->innerJoin('b', 'bookmarks_tree', 'tr', $qb->expr()->eq('tr.id', 'b.id'))
|
||||
->innerJoin('tr', 'bookmarks_shared_folders', 'sf', $qb->expr()->eq('tr.parent_folder', 'sf.folder_id'))
|
||||
->leftJoin('b', 'bookmarks_tree', 'tr', $qb->expr()->eq('tr.id', 'b.id'))
|
||||
->leftJoin('tr', 'bookmarks_shared_folders', 'sf', $qb->expr()->eq('tr.parent_folder', 'sf.folder_id'))
|
||||
->where($qb->expr()->orX(
|
||||
$qb->expr()->eq('b.user_id', $qb->createPositionalParameter($userId)),
|
||||
$qb->expr()->eq('sf.user_id', $qb->createPositionalParameter($userId))
|
||||
|
|
Loading…
Reference in New Issue