[Pkg-owncloud-commits] [owncloud] 27/32: Merge pull request #7745 from owncloud/fix_6946_stable6

[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 14c95086a98e2a2543b7d1eefe30508a3d3a4126
Merge: 4696b06 0a9487e
Author: blizzz <blizzz at owncloud.com>
Date:   Wed Apr 23 16:30:26 2014 +0200

    Merge pull request #7745 from owncloud/fix_6946_stable6
    
    Group Database backend must not gather user details itself but ask user backends, fixes #6946 in stable6

 apps/user_ldap/group_ldap.php  | 21 +-----------------
 apps/user_ldap/group_proxy.php | 16 --------------
 lib/private/group.php          | 12 +---------
 lib/private/group/backend.php  | 22 +------------------
 lib/private/group/database.php | 26 ----------------------
 lib/private/group/group.php    |  6 +----
 lib/private/group/manager.php  | 34 ++++++++++++++++++++++++++++
 lib/private/user/manager.php   |  4 ++--
 tests/lib/group.php            | 19 ----------------
 tests/lib/group/manager.php    | 50 ++++++++++++++++++++++++++++++++++++++++++
 tests/lib/user/manager.php     | 10 ++++-----
 11 files changed, 95 insertions(+), 125 deletions(-)

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