diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
| commit | 6b061c236dd5730837b567f2c39a19af1617d33c (patch) | |
| tree | 27de0d46deae2987ea398f2f2aee4e26786c6f48 /apps/user_ldap/lib/connection.php | |
| parent | 8951328a87c16e5ebfe4d3e5c392347db1e54f92 (diff) | |
| parent | ab696edba685cd6d2a64c2e48907f03197aae53f (diff) | |
| download | nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.tar.gz nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.zip | |
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index b2075748a3b..08ac4ac626b 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -78,6 +78,8 @@ class Connection extends LDAPUtility { //a cloned instance inherits the connection resource. It may use it, //but it may not disconnect it $this->dontDestruct = true; + $this->configuration = new Configuration($this->configPrefix, + !is_null($this->configID)); } public function __get($name) { |