diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-31 13:48:27 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:29 +0200 |
| commit | a98b7dbf6fc3a190d995326ea97f88296ed89080 (patch) | |
| tree | 7df73e10573e41bec864dd43e5e6b0fb0c0945ec /lib/private/encryption/manager.php | |
| parent | 35b97ed67292efe1ba94996bd4ffb8b2c9694de9 (diff) | |
| download | nextcloud-server-a98b7dbf6fc3a190d995326ea97f88296ed89080.tar.gz nextcloud-server-a98b7dbf6fc3a190d995326ea97f88296ed89080.zip | |
Fix double registration of encryption module
Diffstat (limited to 'lib/private/encryption/manager.php')
| -rw-r--r-- | lib/private/encryption/manager.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index bf411ea95e9..cf11c3cf335 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -69,14 +69,11 @@ class Manager implements \OCP\Encryption\IManager { $id = $module->getId(); $name = $module->getDisplayName(); - // FIXME why do we load the same encryption module multiple times - /* if (isset($this->encryptionModules[$id])) { $message = 'Id "' . $id . '" already used by encryption module "' . $name . '"'; throw new Exceptions\ModuleAlreadyExistsException($message); - } -*/ + $defaultEncryptionModuleId = $this->getDefaultEncryptionModuleId(); if (empty($defaultEncryptionModuleId)) { |