From 12ce9fd4c79954fd966ae2268db13f130bc6d4a8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 16 Apr 2019 12:50:20 +0200 Subject: [PATCH] Ignore address_book_type setting when checking for global addressbooks --- plugins/kolab_addressbook/kolab_addressbook.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php index 37178d0f..139072c7 100644 --- a/plugins/kolab_addressbook/kolab_addressbook.php +++ b/plugins/kolab_addressbook/kolab_addressbook.php @@ -831,10 +831,9 @@ class kolab_addressbook extends rcube_plugin } $ldap_public = $this->rc->config->get('ldap_public'); - $abook_type = $this->rc->config->get('address_book_type'); // Hide option if there's no global addressbook - if (empty($ldap_public) || $abook_type != 'ldap') { + if (empty($ldap_public)) { return $args; } @@ -1126,9 +1125,8 @@ class kolab_addressbook extends rcube_plugin // Make sure any global addressbooks are defined if ($abook_prio == 0 || $abook_prio == 2) { $ldap_public = $this->rc->config->get('ldap_public'); - $abook_type = $this->rc->config->get('address_book_type'); - if (empty($ldap_public) || $abook_type != 'ldap') { + if (empty($ldap_public)) { $abook_prio = 1; } }