From 12afd7b0059a2afb851a2ea69cec351a8d5b9478 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Feb 2016 10:38:12 +0100 Subject: Move password update hook after update --- lib/private/share20/manager.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'lib') 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( -- cgit v1.2.3