summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-05-14 01:07:16 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-05-19 12:56:07 +0200
commit76dfc872272ea91c9f976a8486a3f6ea10a2d123 (patch)
treeb4e6db799370a8e400a2e5e229662dd10e64baa0 /apps
parent6b218039ba4a49cd2af4a3dbceb9c41139a5848f (diff)
downloadnextcloud-server-76dfc872272ea91c9f976a8486a3f6ea10a2d123.tar.gz
nextcloud-server-76dfc872272ea91c9f976a8486a3f6ea10a2d123.zip
add primary group users to resultset before caching
Diffstat (limited to 'apps')
-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 182142cb80a..4c5c01743aa 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);