diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-09 10:38:12 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-09 10:38:12 +0100 |
| commit | 12afd7b0059a2afb851a2ea69cec351a8d5b9478 (patch) | |
| tree | df9fb421fdd6066ff813c4b134758ed99f5e08d4 /lib | |
| parent | 623a0e463755f9f429f1505a939f86492571f5ce (diff) | |
| download | nextcloud-server-12afd7b0059a2afb851a2ea69cec351a8d5b9478.tar.gz nextcloud-server-12afd7b0059a2afb851a2ea69cec351a8d5b9478.zip | |
Move password update hook after update
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/share20/manager.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php index 76b28a5087f..3a19bd2dc3a 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -595,14 +595,6 @@ class Manager implements IManager { if ($share->getPassword() !== null) { $share->setPassword($this->hasher->hash($share->getPassword())); } - - \OC_Hook::emit('OCP\Share', 'post_update_password', [ - 'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder', - 'itemSource' => $share->getNode()->getId(), - 'uidOwner' => $share->getSharedBy(), - 'token' => $share->getToken(), - 'disabled' => is_null($share->getPassword()), - ]); } if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { @@ -627,6 +619,16 @@ class Manager implements IManager { ]); } + if ($share->getPassword() !== $originalShare->getPassword()) { + \OC_Hook::emit('OCP\Share', 'post_update_password', [ + 'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder', + 'itemSource' => $share->getNode()->getId(), + 'uidOwner' => $share->getSharedBy(), + 'token' => $share->getToken(), + 'disabled' => is_null($share->getPassword()), + ]); + } + if ($share->getPermissions() !== $originalShare->getPermissions()) { $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); \OC_Hook::emit('OCP\Share', 'post_update_permissions', array( |