diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
| commit | 6c20a014eaecd19c3f68143485c6f74891ee9643 (patch) | |
| tree | 84bd8e37536e7f28a25afd7586c209d38a25d610 /apps/files_encryption/tests/util.php | |
| parent | cd0c5990f895bcdce47acf2dbf11ebadd920a404 (diff) | |
| parent | 3fc809dfd80a296d7da922a06f9e13d446b3d3f0 (diff) | |
| download | nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.tar.gz nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.zip | |
merge master into webdav-injection
Diffstat (limited to 'apps/files_encryption/tests/util.php')
| -rwxr-xr-x | apps/files_encryption/tests/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 55a056613e4..a29ef831a52 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -524,8 +524,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { \OC_Util::tearDownFS(); \OC_User::setUserId(''); \OC\Files\Filesystem::tearDown(); - \OC_Util::setupFS($user); \OC_User::setUserId($user); + \OC_Util::setupFS($user); $params['uid'] = $user; $params['password'] = $password; |