aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-15 02:36:23 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-15 02:36:23 +0200
commit499fe6ca8e28d559ad8aba7724766c111c65290a (patch)
treeb6b5fad57ff6c199797065eb172982a96d871dd5
parentddedf201062c99f4dfce64b2dde8c912d8305491 (diff)
downloadnextcloud-server-499fe6ca8e28d559ad8aba7724766c111c65290a.tar.gz
nextcloud-server-499fe6ca8e28d559ad8aba7724766c111c65290a.zip
disabled FileProxy in Keymanager::getPrivateKey
-rwxr-xr-xapps/files_encryption/lib/keymanager.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 8ee7820b169..74462a0d1ed 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -38,9 +38,14 @@ class Keymanager {
public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
$key = $view->file_get_contents( $path );
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $key;
}