summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-05-14 01:07:16 +0200
committerArthur Schiwon <blizzz@owncloud.com>2015-07-23 14:33:30 +0200
commit4253838b2478f0e3542992b304d1470555b4b27a (patch)
treeaa2330c1c2b91e3fd92a793c661e33a4b0dc6e59
parent9dcc7465aaa0d8834f2f6479fd9c84ee85d3618e (diff)
downloadnextcloud-server-4253838b2478f0e3542992b304d1470555b4b27a.tar.gz
nextcloud-server-4253838b2478f0e3542992b304d1470555b4b27a.zip
add primary group users to resultset before caching
-rw-r--r--apps/user_ldap/group_ldap.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 57e565bdd1b..4041cc3677c 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -510,10 +510,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);