diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index b9d83aad68..d6f4bdcde0 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -78,8 +78,6 @@ class Connection extends LDAPUtility { $memcache = \OC::$server->getMemCacheFactory(); if($memcache->isAvailable()) { $this->cache = $memcache->create(); - } else { - $this->cache = \OC\Cache::getGlobalCache(); } $this->hasPagedResultSupport = $this->ldap->hasPagedResultSupport(); @@ -195,7 +193,7 @@ class Connection extends LDAPUtility { if(!$this->configured) { $this->readConfiguration(); } - if(!$this->configuration->ldapCacheTTL) { + if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { return null; } if(!$this->isCached($key)) { @@ -215,7 +213,7 @@ class Connection extends LDAPUtility { if(!$this->configured) { $this->readConfiguration(); } - if(!$this->configuration->ldapCacheTTL) { + if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { return false; } $key = $this->getCacheKey($key); @@ -225,12 +223,15 @@ class Connection extends LDAPUtility { /** * @param string $key * @param mixed $value + * + * @return string */ public function writeToCache($key, $value) { if(!$this->configured) { $this->readConfiguration(); } - if(!$this->configuration->ldapCacheTTL + if(is_null($this->cache) + || !$this->configuration->ldapCacheTTL || !$this->configuration->ldapConfigurationActive) { return null; } @@ -240,7 +241,9 @@ class Connection extends LDAPUtility { } public function clearCache() { - $this->cache->clear($this->getCacheKey(null)); + if(!is_null($this->cache)) { + $this->cache->clear($this->getCacheKey(null)); + } } /**