[Pkg-owncloud-commits] [owncloud] 19/79: Merge pull request #17951 from owncloud/backport-17464-stable8.1

[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 ac04692eacb0afbfe473fd19ab1d56e2a53f723d
Merge: f7cb36a 9bfbed5
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Aug 12 10:19:16 2015 +0200

    Merge pull request #17951 from owncloud/backport-17464-stable8.1
    
    [stable8.1] Backport of #17464, fix uncaught exception on not permitted file type…

 apps/user_ldap/lib/user/user.php                   |   8 +-
 .../tests/integration/abstractintegrationtest.php  | 137 +++++++++++++++++++++
 .../tests/integration/data/avatar-invalid.gif      | Bin 0 -> 48702 bytes
 .../tests/integration/data/avatar-valid.jpg        | Bin 0 -> 95495 bytes
 apps/user_ldap/tests/integration/fakemanager.php   |  33 +++++
 .../lib/IntegrationTestAccessGroupsMatchFilter.php | 128 +++++--------------
 .../lib/user/IntegrationTestUserAvatar.php         | 128 +++++++++++++++++++
 apps/user_ldap/tests/integration/run-test.sh       |   2 +-
 .../setup-scripts/createExplicitUsers.php          |   2 +-
 9 files changed, 340 insertions(+), 98 deletions(-)

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