[Pkg-owncloud-commits] [owncloud] 52/215: Update encryption.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 1756562501e3201ed21a6f8a26b53c6bfdf12934
Author: jknockaert <jasper at knockaert.nl>
Date:   Tue Apr 21 14:43:08 2015 +0200

    Update encryption.php
---
 lib/private/files/stream/encryption.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 936bcb7..2e73e29 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -229,6 +229,14 @@ class Encryption extends Wrapper {
 			$this->readOnly = true;
 		}
 
+		$sharePath = $this->fullPath;
+		if (!$this->storage->file_exists($this->internalPath)) {
+			$sharePath = dirname($sharePath);
+		}
+
+		$accessList = $this->file->getAccessList($sharePath);
+		$this->newHeader = $this->encryptionModule->begin($this->fullPath, $this->uid, $this->header, $accessList);
+
 		if (
 			$mode === 'w'
 			|| $mode === 'w+'
@@ -243,14 +251,6 @@ class Encryption extends Wrapper {
 			parent::stream_read($this->util->getHeaderSize());
 		}
 
-		$sharePath = $this->fullPath;
-		if (!$this->storage->file_exists($this->internalPath)) {
-			$sharePath = dirname($sharePath);
-		}
-
-		$accessList = $this->file->getAccessList($sharePath);
-		$this->newHeader = $this->encryptionModule->begin($this->fullPath, $this->uid, $this->header, $accessList);
-
 		return true;
 
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git