diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-15 20:03:00 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-15 20:03:00 +0200 |
| commit | c82adb8c5db01d6a49c4364f7eecb2931f59cfa1 (patch) | |
| tree | 2c18fa58b47ff03aa3f872a1c13c0b2fe4968fed /apps/files_encryption/tests | |
| parent | 371a924c92bb751b81e2a819d8c581743be7a797 (diff) | |
| parent | 2eeab60378a3e22e19c4f435aa2bf65cc9da7c2a (diff) | |
| download | nextcloud-server-c82adb8c5db01d6a49c4364f7eecb2931f59cfa1.tar.gz nextcloud-server-c82adb8c5db01d6a49c4364f7eecb2931f59cfa1.zip | |
merge master into webdav-injection
Diffstat (limited to 'apps/files_encryption/tests')
| -rwxr-xr-x | apps/files_encryption/tests/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index be56968ac09..1f57d7cb635 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -100,11 +100,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->filename = 'share-tmp.test'; - // we don't want to tests with app files_trashbin enabled - \OC_App::disable('files_trashbin'); - // remember files_trashbin state $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin'); + + // we don't want to tests with app files_trashbin enabled + \OC_App::disable('files_trashbin'); } function tearDown() { |