summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-12-13 18:01:42 +0100
committerArthur Schiwon <blizzz@owncloud.com>2014-01-14 16:33:09 +0100
commit097b6b8be919486a78894a364345042472ca800c (patch)
treed8c67b8fb80ad977704bc1dd2c69a1c0835e0bd5
parentbb6bad6b3c1d8a2779945f206df952d7aa25ed62 (diff)
downloadnextcloud-server-097b6b8be919486a78894a364345042472ca800c.tar.gz
nextcloud-server-097b6b8be919486a78894a364345042472ca800c.zip
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page
-rw-r--r--apps/user_ldap/lib/connection.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 14dfaa1174d..c4e4efd0483 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -50,7 +50,8 @@ class Connection extends LDAPUtility {
parent::__construct($ldap);
$this->configPrefix = $configPrefix;
$this->configID = $configID;
- $this->configuration = new Configuration($configPrefix);
+ $this->configuration = new Configuration($configPrefix,
+ !is_null($configID));
$memcache = new \OC\Memcache\Factory();
if($memcache->isAvailable()) {
$this->cache = $memcache->create();