diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-14 15:14:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 15:14:39 +0100 |
| commit | 3c2312fb09ccc97652c9c1794e02d2111c1d4df5 (patch) | |
| tree | 0051963d06b52ec9421deaca62d4363f75a3482f /lib | |
| parent | 8217b16cfecece7e5f5e6a76b0716ef155ae4b63 (diff) | |
| parent | 708b62f223a7b791455d6d1231fe913d39c82560 (diff) | |
| download | nextcloud-server-3c2312fb09ccc97652c9c1794e02d2111c1d4df5.tar.gz nextcloud-server-3c2312fb09ccc97652c9c1794e02d2111c1d4df5.zip | |
Merge pull request #3783 from andrius-kulbis/master
Fix deleted objectstore shares
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 23e8db34d7f..fe6472c31a0 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -642,7 +642,8 @@ class DefaultShareProvider implements IShareProvider { // exclude shares leading to trashbin on home storages $pathSections = explode('/', $data['path'], 2); // FIXME: would not detect rare md5'd home storage case properly - if ($pathSections[0] !== 'files' && explode(':', $data['storage_string_id'], 2)[0] === 'home') { + if ($pathSections[0] !== 'files' + && in_array(explode(':', $data['storage_string_id'], 2)[0], array('home', 'object'))) { return false; } return true; |