[Pkg-owncloud-commits] [owncloud] 29/239: Merge branch 'master' into encryption_work_with_public_gallery

[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 16b484209c4792ce8c43f197d678e3fb393b3ee5
Merge: 2b361ea 391f267
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 10:33:37 2013 +0100

    Merge branch 'master' into encryption_work_with_public_gallery
    
    Conflicts:
    	apps/files_encryption/lib/keymanager.php
    	apps/files_encryption/lib/stream.php
    	apps/files_encryption/lib/util.php
    	apps/files_encryption/tests/crypt.php

 apps/files_encryption/lib/keymanager.php    |  1 +
 apps/files_encryption/lib/proxy.php         |  3 +++
 apps/files_encryption/lib/stream.php        |  3 ++-
 apps/files_encryption/lib/util.php          | 21 +++++++++------------
 apps/files_external/lib/sftp.php            | 14 ++++++++------
 apps/files_external/lib/webdav.php          |  4 ++--
 lib/private/connector/sabre/filesplugin.php |  2 ++
 lib/private/files/storage/common.php        | 26 ++++++--------------------
 lib/private/files/storage/commontest.php    |  2 +-
 lib/private/files/storage/local.php         |  8 --------
 lib/private/files/storage/mappedlocal.php   |  8 --------
 version.php                                 |  4 ++--
 12 files changed, 36 insertions(+), 60 deletions(-)

diff --cc apps/files_encryption/lib/keymanager.php
index b207b14,3427e8a..4695673
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@@ -179,8 -178,10 +179,9 @@@ class Keymanager 
  	 * @note The keyfile returned is asymmetrically encrypted. Decryption
  	 * of the keyfile must be performed by client code
  	 */
 -	public static function getFileKey(\OC_FilesystemView $view, $filePath) {
 +	public static function getFileKey(\OC_FilesystemView $view, $util, $filePath) {
  
 -		$util = new Util($view, \OCP\User::getUser());
+ 
  		list($owner, $filename) = $util->getUidAndFilename($filePath);
  		$filename = Helper::stripPartialFileExtension($filename);
  		$filePath_f = ltrim($filename, '/');

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