[Pkg-owncloud-commits] [owncloud] 28/239: Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 18c80e47b660d33650164f34889e5bc3dd7faa1f
Merge: b27fc42 2b361ea
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 10:24:47 2013 +0100

    Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
    
    Conflicts:
    	apps/files_encryption/lib/stream.php

 apps/files_encryption/lib/stream.php | 31 +++++++++++++++----------------
 apps/files_encryption/lib/util.php   | 32 +++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --cc apps/files_encryption/lib/stream.php
index 3fbcf7d,409c6ff..f2df7f4
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@@ -90,9 -91,6 +91,7 @@@ class Stream 
  			$this->rootView = new \OC_FilesystemView('/');
  		}
  
- 		// rawPath is relative to the data directory
- 		$this->rawPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
 +
  		$this->session = new \OCA\Encryption\Session($this->rootView);
  
  		$this->privateKey = $this->session->getPrivateKey();
@@@ -528,10 -526,10 +527,10 @@@
  				$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
  
  				// Save the new encrypted file key
- 				Keymanager::setFileKey($this->rootView, $util, $this->relPath, $userId, $this->encKeyfiles['data']);
 -				Keymanager::setFileKey($this->rootView, $this->relPath, $this->keyId, $this->encKeyfiles['data']);
++				Keymanager::setFileKey($this->rootView, $util, $this->relPath, $this->keyId, $this->encKeyfiles['data']);
  
  				// Save the sharekeys
 -				Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
 +				Keymanager::setShareKeys($this->rootView, $util, $this->relPath, $this->encKeyfiles['keys']);
  
  				// Re-enable proxy - our work is done
  				\OC_FileProxy::$enabled = $proxyStatus;

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