[Pkg-owncloud-commits] [owncloud] 67/457: add primary group users to resultset before caching

[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 76dfc872272ea91c9f976a8486a3f6ea10a2d123
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu May 14 01:07:16 2015 +0200

    add primary group users to resultset before caching
---
 apps/user_ldap/group_ldap.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 182142c..4c5c017 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -516,10 +516,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			}
 		}
 
+		$groupUsers = array_unique(array_merge($groupUsers, $primaryUsers));
 		natsort($groupUsers);
 		$this->access->connection->writeToCache('usersInGroup-'.$gid.'-'.$search, $groupUsers);
 		$groupUsers = array_slice($groupUsers, $offset, $limit);
-		$groupUsers = array_unique(array_merge($groupUsers, $primaryUsers));
+
 
 		$this->access->connection->writeToCache($cacheKey, $groupUsers);
 

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