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 | |
| parent | 35b97ed67292efe1ba94996bd4ffb8b2c9694de9 (diff) | |
| download | nextcloud-server-a98b7dbf6fc3a190d995326ea97f88296ed89080.tar.gz nextcloud-server-a98b7dbf6fc3a190d995326ea97f88296ed89080.zip | |
Fix double registration of encryption module
| -rw-r--r-- | apps/encryption/appinfo/app.php | 7 | ||||
| -rw-r--r-- | apps/encryption/appinfo/application.php | 2 | ||||
| -rw-r--r-- | lib/private/encryption/manager.php | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php index 38f9ff2f040..8573f8d605d 100644 --- a/apps/encryption/appinfo/app.php +++ b/apps/encryption/appinfo/app.php @@ -21,8 +21,5 @@ namespace OCA\Encryption\AppInfo; -if (!\OC::$CLI) { - $di = \OC::$server; - $app = new Application(); -} - +$app = new Application(); +$app->registerEncryptionModule(); diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php index be432b1a5a8..30962e83ada 100644 --- a/apps/encryption/appinfo/application.php +++ b/apps/encryption/appinfo/application.php @@ -55,7 +55,7 @@ class Application extends \OCP\AppFramework\App { $this->encryptionManager = \OC::$server->getEncryptionManager(); $this->config = \OC::$server->getConfig(); $this->registerServices(); - $this->registerEncryptionModule(); +// $this->registerEncryptionModule(); $this->registerHooks(); $this->registerSettings(); } 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)) { |