From ddedf201062c99f4dfce64b2dde8c912d8305491 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 02:34:36 +0200
Subject: [PATCH] prevent of infinite loop with FileProxy
---
apps/files_encryption/lib/stream.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index db7d2ad617..ab96783508 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -509,15 +509,15 @@ class Stream {
// Save the sharekeys
Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
-
// get file info
$fileInfo = $view->getFileInfo($this->rawPath);
if(!is_array($fileInfo)) {
$fileInfo = array();
}
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
// set encryption data
$fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;
--
GitLab