diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-10-24 15:59:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 15:59:13 +0200 |
| commit | 306d4e1d40ce076b715a5f0a87e743189da775e6 (patch) | |
| tree | 4d4737ea9c757e7e9018b9d5a74534bf41b4196b /apps/encryption | |
| parent | f8e4d0d564a71856dcb0e223f0dd279209383fd1 (diff) | |
| parent | 5987099d2a7801d89310dc9e829927a67c1af9d2 (diff) | |
| download | nextcloud-server-306d4e1d40ce076b715a5f0a87e743189da775e6.tar.gz nextcloud-server-306d4e1d40ce076b715a5f0a87e743189da775e6.zip | |
Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
Diffstat (limited to 'apps/encryption')
| -rw-r--r-- | apps/encryption/lib/Hooks/UserHooks.php | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index e0826e2c7e3..a08796aee54 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -170,11 +170,6 @@ class UserHooks implements IHook { * @return boolean|null */ public function login($params) { - - if (!App::isEnabled('encryption')) { - return true; - } - // ensure filesystem is loaded if (!\OC\Files\Filesystem::$loaded) { $this->setupFS($params['uid']); @@ -200,10 +195,7 @@ class UserHooks implements IHook { * @param array $params */ public function postCreateUser($params) { - - if (App::isEnabled('encryption')) { - $this->userSetup->setupUser($params['uid'], $params['password']); - } + $this->userSetup->setupUser($params['uid'], $params['password']); } /** @@ -213,17 +205,12 @@ class UserHooks implements IHook { * @note This method should never be called for users using client side encryption */ public function postDeleteUser($params) { - - if (App::isEnabled('encryption')) { - $this->keyManager->deletePublicKey($params['uid']); - } + $this->keyManager->deletePublicKey($params['uid']); } public function prePasswordReset($params) { - if (App::isEnabled('encryption')) { - $user = $params['uid']; - self::$passwordResetUsers[$user] = true; - } + $user = $params['uid']; + self::$passwordResetUsers[$user] = true; } public function postPasswordReset($params) { |