wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double registration of encryption module

Browse source
This commit is contained in:
Thomas Müller 2015-03-31 13:48:27 +02:00
parent 35b97ed672
commit a98b7dbf6f
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/encryption/appinfo/app.php
View file

@ -21,8 +21,5 @@
namespace OCA\Encryption\AppInfo;
if (!\OC::$CLI) {
$di = \OC::$server;
$app = new Application();
}
$app = new Application();
$app->registerEncryptionModule();

2
apps/encryption/appinfo/application.php
View file

@ -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();
}

5
lib/private/encryption/manager.php
View file

@ -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)) {