diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2015-04-16 09:34:47 -0400 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2015-04-16 09:34:47 -0400 |
| commit | 1174ad0681bb82252a26b5ee44d5b2990171932b (patch) | |
| tree | 77f5d7d2e65e9d5eeedb3f36f0576cb5196ba09e /apps/encryption/appinfo/app.php | |
| parent | c7e5e30b86733a22ac0d411e00537b10e0220ddd (diff) | |
| parent | 959665003b408ed837066307350fb76b83beaa52 (diff) | |
| download | nextcloud-server-1174ad0681bb82252a26b5ee44d5b2990171932b.tar.gz nextcloud-server-1174ad0681bb82252a26b5ee44d5b2990171932b.zip | |
Merge pull request #15445 from owncloud/enc2_migration
add migration script from old encryption to new one
Diffstat (limited to 'apps/encryption/appinfo/app.php')
| -rw-r--r-- | apps/encryption/appinfo/app.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php index 6bbf2113366..0e8ce56227b 100644 --- a/apps/encryption/appinfo/app.php +++ b/apps/encryption/appinfo/app.php @@ -24,6 +24,8 @@ namespace OCA\Encryption\AppInfo; $app = new Application(); -$app->registerEncryptionModule(); -$app->registerHooks(); -$app->registerSettings(); +if (\OC::$server->getEncryptionManager()->isReady()) { + $app->registerEncryptionModule(); + $app->registerHooks(); + $app->registerSettings(); +} |