From: Björn Schießle <schiessle@owncloud.com>
Date: Fri, 17 May 2013 12:49:54 +0000 (+0200)
Subject: some typo fixed
X-Git-Tag: v6.0.0alpha2~743^2~50
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=002445e23d8dcefe2545f22e6914d7cfa7ebbbd1;p=nextcloud-server.git

some typo fixed
---

diff --git a/3rdparty b/3rdparty
deleted file mode 160000
index 2d59ac4f7bd..00000000000
--- 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 a2dee1ca71f..f1042ed759a 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);