[Pkg-owncloud-commits] [owncloud] 50/215: Merge pull request #15839 from owncloud/enc_fix_moving_shared_files

[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 4334e770355df1583011c7e015b5caee48c91204
Merge: 8cefc65 411f789
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Fri Apr 24 15:07:36 2015 +0200

    Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
    
    [encryption] fix moving files to a shared folder

 lib/private/encryption/file.php                  |   4 +-
 lib/private/encryption/keys/storage.php          |   9 ++
 lib/private/encryption/manager.php               |  20 +++-
 lib/private/encryption/update.php                |  66 ++++++++---
 lib/private/encryption/util.php                  |  20 ++--
 lib/private/files/storage/wrapper/encryption.php |  58 ++++++---
 lib/public/encryption/keys/istorage.php          |   2 +
 tests/lib/encryption/updatetest.php              | 129 ++++++++++++++++++++
 tests/lib/encryption/utiltest.php                |  21 ++++
 tests/lib/files/storage/wrapper/encryption.php   | 145 +++++++++++++++++++----
 10 files changed, 399 insertions(+), 75 deletions(-)

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