diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 16:46:45 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 16:46:45 +0200 |
| commit | 1fbf5d86df7ba4001ca826d9dfb8fad073924fde (patch) | |
| tree | 9260b35011fabbbf69747419282d193fa7a9089c /core | |
| parent | 2182ae0d278f466e7f117b03bf4ebca0e6e9fe9b (diff) | |
| parent | 2d2cb09715554926945de29b80f033905a219abd (diff) | |
| download | nextcloud-server-1fbf5d86df7ba4001ca826d9dfb8fad073924fde.tar.gz nextcloud-server-1fbf5d86df7ba4001ca826d9dfb8fad073924fde.zip | |
Merge pull request #14472 from owncloud/feature/wipencryptionapp
encryption 2.0 app
Diffstat (limited to 'core')
| -rw-r--r-- | core/application.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/application.php b/core/application.php index 5d12ea0280e..cca2c600118 100644 --- a/core/application.php +++ b/core/application.php @@ -88,8 +88,8 @@ class Application extends App { /** * Core class wrappers */ - $container->registerService('IsEncryptionEnabled', function() { - return \OC_App::isEnabled('files_encryption'); + $container->registerService('IsEncryptionEnabled', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getEncryptionManager()->isEnabled(); }); $container->registerService('URLGenerator', function(SimpleContainer $c) { return $c->query('ServerContainer')->getURLGenerator(); |