From cc879e508bee934aeea1f7068c72a87649b5b7ad Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 10 Nov 2009 19:56:17 +0100
Subject: [PATCH] MFB: Don't show address book preference group if address
 books are disabled (Bug #8692).

---
 imp/config/prefs.php.dist | 15 +++++++++------
 imp/docs/CHANGES          |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index e5adb9237..3d030c976 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -157,12 +157,15 @@ $prefGroups['filters'] = array(
     'url' => 'filterprefs.php'
 );
 
-$prefGroups['addressbooks'] = array(
-    'column' => _("Other Options"),
-    'label' => _("Address Books"),
-    'desc' => _("Select address book sources for adding and searching for addresses."),
-    'members' => array('save_recipients', 'display_contact', 'sourceselect')
-);
+$contacts_app = $GLOBALS['registry']->hasInterface('contacts');
+if ($contacts_app && $GLOBALS['registry']->hasPermission($contacts_app)) {
+    $prefGroups['addressbooks'] = array(
+        'column' => _("Other Options"),
+        'label' => _("Address Books"),
+        'desc' => _("Select address book sources for adding and searching for addresses."),
+        'members' => array('save_recipients', 'display_contact', 'sourceselect')
+        );
+}
 
 $prefGroups['events'] = array(
     'column' => _("Other Options"),
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index f5c1ae96b..3cbc70446 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -113,6 +113,8 @@ v5.0-git
 v4.3.6-cvs
 ----------
 
+[jan] Don't show address book preference group if address books are disabled
+      (Bug #8692).
 [mms] Save References/In-Reply-To header info when saving a draft (Bug #8661).
 [jan] Fix viewing S/MIME encrypted and signed messages from Outlook (Express)
       (Bug #8629).
-- 
2.11.0