From 002445e23d8dcefe2545f22e6914d7cfa7ebbbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 14:49:54 +0200
Subject: [PATCH] some typo fixed
---
3rdparty | 1 -
apps/files_encryption/lib/util.php | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
delete mode 160000 3rdparty
diff --git a/3rdparty b/3rdparty
deleted file mode 160000
index 2d59ac4f7b..0000000000
--- a/3rdparty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a2dee1ca71..f1042ed759 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -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);
--
GitLab