diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:45:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 1b42b492dce562596b8b57a11546728f697c4f38 (patch) | |
| tree | 6280aa40baaf55db44edf84a906b83db2d47fc46 /apps/encryption | |
| parent | dbdd754c3fc37dc3100a9741f956d913e6d64576 (diff) | |
| download | nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.tar.gz nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.zip | |
kill OC_FileProxy :boom:
Diffstat (limited to 'apps/encryption')
| -rw-r--r-- | apps/encryption/lib/keymanager.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 68fb722c5ea..d9b670c3f5a 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -375,10 +375,6 @@ class KeyManager { $keyPair = $this->crypt->createKeyPair(); - // Disable encryption proxy to prevent recursive calls - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; - // Save public key $this->setPublicKey($user, $keyPair['publicKey']); @@ -395,8 +391,6 @@ class KeyManager { } else { $this->log->error('Encryption Could not update users encryption password'); } - - \OC_FileProxy::$enabled = $proxyStatus; } } } |