[Pkg-owncloud-commits] [owncloud] 06/104: 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

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 3d81009347c46bde5fbdb9908346e0ee3ff28ff0
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Dec 13 18:01:42 2013 +0100

    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
---
 apps/user_ldap/lib/connection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 14dfaa1..c4e4efd 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git