summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/tests/trashbin.php
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-05-26 17:28:27 +0200
committerBjörn Schießle <bjoern@schiessle.org>2015-05-26 17:28:27 +0200
commit9366dde8756a0f11dfcbb4b95002c6710fc6b846 (patch)
tree5c0e2a974b2d94a2e96cfe2d06976ea2d620a72c /apps/files_trashbin/tests/trashbin.php
parent07c6e523b1c1bec7997c65927ba43e393dc8f5f0 (diff)
parent7d2666699bc37a8f45035e82712143818ed0ab65 (diff)
downloadnextcloud-server-9366dde8756a0f11dfcbb4b95002c6710fc6b846.tar.gz
nextcloud-server-9366dde8756a0f11dfcbb4b95002c6710fc6b846.zip
Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
[enc2] fix references to legacy encryption app name
Diffstat (limited to 'apps/files_trashbin/tests/trashbin.php')
-rw-r--r--apps/files_trashbin/tests/trashbin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 0c37af24de5..5535b3315bc 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);