diff options
| -rw-r--r-- | apps/files_trashbin/lib/helper.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/tests/trashbin.php | 2 | ||||
| -rw-r--r-- | core/command/user/resetpassword.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index bc9ebd6ee02..5d244d7b39c 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -115,7 +115,7 @@ class Helper $entry['id'] = $id++; $entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image $entry['permissions'] = \OCP\Constants::PERMISSION_READ; - if (\OCP\App::isEnabled('files_encryption')) { + if (\OCP\App::isEnabled('encryption')) { $entry['isPreviewAvailable'] = false; } $files[] = $entry; diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 31d77c01c91..35cb50097e0 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -476,7 +476,7 @@ class Trashbin { */ private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) { $size = 0; - if (\OCP\App::isEnabled('files_encryption')) { + if (\OCP\App::isEnabled('encryption')) { $keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename); diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 85c47b527b7..12f2900d983 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -67,7 +67,7 @@ class Test_Trashbin extends \Test\TestCase { $application->setupPropagation(); //disable encryption - \OC_App::disable('files_encryption'); + \OC_App::disable('encryption'); //configure trashbin self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION); diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php index 7c405592114..3e4b41c0a43 100644 --- a/core/command/user/resetpassword.php +++ b/core/command/user/resetpassword.php @@ -78,7 +78,7 @@ class ResetPassword extends Command { /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */ $dialog = $this->getHelperSet()->get('dialog'); - if (\OCP\App::isEnabled('files_encryption')) { + if (\OCP\App::isEnabled('encryption')) { $output->writeln( '<error>Warning: Resetting the password when using encryption will result in data loss!</error>' ); |