diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-12-06 05:41:08 -0800 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-12-06 05:41:08 -0800 |
| commit | b18c8e5c53dcc2dca5e8600067910f155f9048d8 (patch) | |
| tree | cd51ed2b48cf38f2e9bf167a58cb1abdde1db852 /apps | |
| parent | ae38ed51fee4238726893ce7e2a7ce2eedc9d857 (diff) | |
| parent | 3f7aac1a794dc2e988776a28ced268bb41f7c9e0 (diff) | |
| download | nextcloud-server-b18c8e5c53dcc2dca5e8600067910f155f9048d8.tar.gz nextcloud-server-b18c8e5c53dcc2dca5e8600067910f155f9048d8.zip | |
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
Sharing etag propagation on expire
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/updater.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 44ebb5cd3cd..23ebc9fb811 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -112,8 +112,12 @@ class Shared_Updater { */ static public function shareHook($params) { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { - $uidOwner = \OCP\User::getUser(); - $users = \OCP\Share::getUsersItemShared($params['itemType'], $params['fileSource'], $uidOwner, true); + if (isset($params['uidOwner'])) { + $uidOwner = $params['uidOwner']; + } else { + $uidOwner = \OCP\User::getUser(); + } + $users = \OCP\Share::getUsersItemShared($params['itemType'], $params['fileSource'], $uidOwner, true, false); if (!empty($users)) { while (!empty($users)) { $reshareUsers = array(); |