summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-09-21 11:50:53 +0000
committeralecpl <alec@alec.pl>2009-09-21 11:50:53 +0000
commit0102742cb2d430fb37ba9aec09686256e0b44be1 (patch)
treea29bd8cffb66b11b8eed74c2538e40d32b4541c8 /program/include/rcmail.php
parent104a14d18f99b05060a48ae7d9fbc0e96416c347 (diff)
- Added 'ldap_debug' option + small change to not rely on rcube_config inside rcube_ldap class
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index be9074054..f37f841d5 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -266,7 +266,7 @@ class rcmail
$contacts = $plugin['instance'];
}
else if ($id && $ldap_config[$id]) {
- $contacts = new rcube_ldap($ldap_config[$id]);
+ $contacts = new rcube_ldap($ldap_config[$id], $this->config->get('ldap_debug'), $this->config->mail_domain($_SESSION['imap_host']));
}
else if ($id === '0') {
$contacts = new rcube_contacts($this->db, $this->user->ID);
@@ -275,7 +275,7 @@ class rcmail
// Use the first writable LDAP address book.
foreach ($ldap_config as $id => $prop) {
if (!$writeable || $prop['writable']) {
- $contacts = new rcube_ldap($prop);
+ $contacts = new rcube_ldap($prop, $this->config->get('ldap_debug'), $this->config->mail_domain($_SESSION['imap_host']));
break;
}
}