summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/connection.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-15 13:02:15 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-15 13:02:15 +0100
commit729210daa0a7219966dff7eadedb49f5006fccb0 (patch)
tree0525bcd21ea4b4cfaed0ac13a58b401b73b3c87a /apps/user_ldap/lib/connection.php
parent5d456c7cc21f7640435c4638932984a52b4cdbac (diff)
parentd1f3f121d6992be07c3600882449ce17d56f116f (diff)
downloadnextcloud-server-729210daa0a7219966dff7eadedb49f5006fccb0.tar.gz
nextcloud-server-729210daa0a7219966dff7eadedb49f5006fccb0.zip
Merge branch 'master' into memcache-public
Conflicts: apps/user_ldap/lib/connection.php
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
-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 92168a09ffa..7fbabda7106 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 = \OC::$server->getMemCacheFactory();
if($memcache->isAvailable()) {
$this->cache = $memcache->create();