mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some typo fixed

This commit is contained in:
Björn Schießle 2013-05-17 14:49:54 +02:00
parent 93771f735b
commit 002445e23d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty

@ -1 +0,0 @@
Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee

6
apps/files_encryption/lib/util.php
View File

@ -716,8 +716,8 @@ class Util {
$sharingEnabled = \OCP\Share::isEnabled();
// if file exists try to get sharing users
if ($view->file_exists($legacyFile['path'])) {
$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
if ($this->view->file_exists($legacyFile['path'])) {
$uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
} else {
$uniqueUserIds[] = $this->userId;
}
@ -726,7 +726,7 @@ class Util {
$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
// Recrypt data, generate catfile
$recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'], $publicKeys);
$recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
$rawPath = $legacyFile['path'];
$relPath = $this->stripUserFilesPath($rawPath);