register settings and hooks only once

This commit is contained in:
Bjoern Schiessle 2015-03-31 14:26:38 +02:00 committed by Thomas Müller
parent 4b4aeaa5b2
commit 6bd83c0422
2 changed files with 2 additions and 8 deletions

View file

@ -23,3 +23,5 @@ namespace OCA\Encryption\AppInfo;
$app = new Application();
$app->registerEncryptionModule();
$app->registerHooks();
$app->registerSettings();

View file

@ -55,9 +55,6 @@ class Application extends \OCP\AppFramework\App {
$this->encryptionManager = \OC::$server->getEncryptionManager();
$this->config = \OC::$server->getConfig();
$this->registerServices();
// $this->registerEncryptionModule();
$this->registerHooks();
$this->registerSettings();
}
/**
@ -178,11 +175,6 @@ class Application extends \OCP\AppFramework\App {
*
*/
public function registerSettings() {
// script('encryption', 'encryption');
// script('encryption', 'detect-migration');
// Register settings scripts
App::registerAdmin('encryption', 'settings/settings-admin');
App::registerPersonal('encryption', 'settings/settings-personal');