diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-10 19:39:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 19:39:19 -0500 |
| commit | 11d6fe10237883b0a61f278517d3708bd301724c (patch) | |
| tree | ee3cb99ed03e67f2ce9e48b7ca1ba5cfeb53e282 | |
| parent | 4d90b0520ec4563d189521fc32cb315f5aebb09f (diff) | |
| parent | a555672f2106e7365e0c5351bbd60e7afc161d80 (diff) | |
| download | nextcloud-server-11d6fe10237883b0a61f278517d3708bd301724c.tar.gz nextcloud-server-11d6fe10237883b0a61f278517d3708bd301724c.zip | |
Merge pull request #4283 from nextcloud/shares-by-folder-quote
properly quota table names in getSharesInFolder
| -rw-r--r-- | apps/federatedfilesharing/lib/FederatedShareProvider.php | 2 | ||||
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 2 | ||||
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 9063bbf7450..5623b60ad06 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -608,7 +608,7 @@ class FederatedShareProvider implements IShareProvider { ); } - $qb->innerJoin('s', 'filecache' ,'f', 's.file_source = f.fileid'); + $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid')); $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); $qb->orderBy('id'); diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 332f1c0cf74..ec9568b734e 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -839,7 +839,7 @@ class ShareByMailProvider implements IShareProvider { ); } - $qb->innerJoin('s', 'filecache' ,'f', 's.file_source = f.fileid'); + $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid')); $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); $qb->orderBy('id'); diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index bf8bcc9c6d9..feae147066d 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -493,7 +493,7 @@ class DefaultShareProvider implements IShareProvider { ); } - $qb->innerJoin('s', 'filecache' ,'f', 's.file_source = f.fileid'); + $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid')); $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); $qb->orderBy('id'); |