[Pkg-owncloud-commits] [owncloud] 75/131: Merge pull request #17702 from owncloud/enc_detect_legacy_files2_8.1

[David Prévot]

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

taffit pushed a commit to annotated tag v8.1.1
in repository owncloud.

commit 6383bd3744b4773e239c576e2af8d96be197472d
Merge: 738e116 001dd40
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Fri Jul 17 21:39:45 2015 +0200

    Merge pull request #17702 from owncloud/enc_detect_legacy_files2_8.1
    
    [8.1 backport] make sure that we always detect legacy files correctlly

 lib/private/encryption/util.php                  |  29 ------
 lib/private/files/storage/wrapper/encryption.php | 110 ++++++++++++++++++---
 tests/lib/encryption/utiltest.php                |  13 ---
 tests/lib/files/storage/wrapper/encryption.php   | 120 ++++++++++++++++++++++-
 4 files changed, 210 insertions(+), 62 deletions(-)

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