From b879cd709ef448ad13c5eb2b06ff75e676a1b6c3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 22 Oct 2012 22:46:28 +0200
Subject: [PATCH] LDAP: fix cache save and check, fixes oc-2118
---
apps/user_ldap/group_ldap.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index bd9f7e0c552..9780fc75f9e 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -96,12 +96,13 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!$this->enabled) {
return array();
}
- if($this->connection->isCached('getUserGroups'.$uid)) {
- return $this->connection->getFromCache('getUserGroups'.$uid);
+ $cacheKey = 'getUserGroups'.$uid;
+ if($this->connection->isCached($cacheKey)) {
+ return $this->connection->getFromCache($cacheKey);
}
$userDN = $this->username2dn($uid);
if(!$userDN) {
- $this->connection->writeToCache('getUserGroups'.$uid, array());
+ $this->connection->writeToCache($cacheKey, array());
return array();
}
@@ -124,7 +125,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
));
$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
$groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
- $this->connection->writeToCache('getUserGroups'.$uid, $groups);
+ $this->connection->writeToCache($cacheKey, $groups);
return $groups;
}
--
GitLab