diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2015-04-30 13:02:27 -0400 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2015-05-18 09:45:41 -0400 |
| commit | a0c6c01137a707aab58622dbfc0dba76661386da (patch) | |
| tree | 7de7484e1941d1d408bfffdad39ee9afd574156a /apps | |
| parent | a1e60e78823d0f00681db0a6dc62a5a157b302f4 (diff) | |
| download | nextcloud-server-a0c6c01137a707aab58622dbfc0dba76661386da.tar.gz nextcloud-server-a0c6c01137a707aab58622dbfc0dba76661386da.zip | |
fix references to legacy encryption app name
Diffstat (limited to 'apps')
| -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 |
3 files changed, 3 insertions, 3 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); |