diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-15 02:34:36 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-15 02:34:36 +0200 |
| commit | ddedf201062c99f4dfce64b2dde8c912d8305491 (patch) | |
| tree | 0e5f23a1dc2c387d3334a817dc83012f691d6252 | |
| parent | 791751b5299b59a0c8bc5bc5dbdaf1528543d1c1 (diff) | |
| download | nextcloud-server-ddedf201062c99f4dfce64b2dde8c912d8305491.tar.gz nextcloud-server-ddedf201062c99f4dfce64b2dde8c912d8305491.zip | |
prevent of infinite loop with FileProxy
| -rw-r--r-- | apps/files_encryption/lib/stream.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index db7d2ad6173..ab967835082 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; |