diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-21 15:56:23 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-21 16:06:12 +0100 |
| commit | 658959592d637c3dc8f8bfac8cba962273c72f4b (patch) | |
| tree | 17a1594cea0ab957b7bb72e2bd892589aa492b38 /lib | |
| parent | 3a582e88e599d53108bcd7a299a56202513f3bd5 (diff) | |
| download | nextcloud-server-658959592d637c3dc8f8bfac8cba962273c72f4b.tar.gz nextcloud-server-658959592d637c3dc8f8bfac8cba962273c72f4b.zip | |
[Share 2.0] Fix displaying old shares proplery
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/share20/defaultshareprovider.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/private/share20/defaultshareprovider.php b/lib/private/share20/defaultshareprovider.php index e0b437bbcc7..5d768a4bc4b 100644 --- a/lib/private/share20/defaultshareprovider.php +++ b/lib/private/share20/defaultshareprovider.php @@ -263,7 +263,18 @@ class DefaultShareProvider implements IShareProvider { * Reshares for this user are shares where they are the owner. */ if ($reshares === false) { - $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($user->getUID()))); + //Special case for old shares created via the web UI + $or1 = $qb->expr()->andX( + $qb->expr()->eq('uid_owner', $qb->createNamedParameter($user->getUID())), + $qb->expr()->isNull('uid_initiator') + ); + + $qb->andWhere( + $qb->expr()->orX( + $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($user->getUID())), + $or1 + ) + ); } else { $qb->andWhere( $qb->expr()->orX( |