upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

workaround to get the unit test going

Browse source
This commit is contained in:
Thomas Müller 2014-06-04 08:21:28 +02:00
parent 2c8288d8f9
commit 917f389747
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/files_encryption/hooks/hooks.php
View file

@ -99,12 +99,14 @@ class Hooks {
// Set legacy encryption key if it exists, to support
// depreciated encryption system
$encLegacyKey = $userView->file_get_contents('encryption.key');
if ($encLegacyKey) {
if ($userView->file_exists('encryption.key')) {
$encLegacyKey = $userView->file_get_contents('encryption.key');
if ($encLegacyKey) {
$plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);
$plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);
$session->setLegacyKey($plainLegacyKey);
$session->setLegacyKey($plainLegacyKey);
}
}
// Encrypt existing user files