From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 14 Apr 2010 18:43:27 +0000 (-0400)
Subject: These methods are not provided by IMP therefore we must check for them before calling.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a874d22a44cd43c6c0c67be106e8055c7dd54df1;p=horde.git

These methods are not provided by IMP therefore we must check for them before calling.

This was preventing ALL of imp's prefs from being loaded, since Horde_Prefs::_loadDefaults()
was catching the exception and returning. This fixes Bug: # 8962 and possibly Bug: #8961
---

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index ef3c83038..abfe432fb 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -1333,7 +1333,7 @@ $prefGroups['filters'] = array(
 
 $_prefs['filters_link'] = array(
     'type' => 'link',
-    'url' => $GLOBALS['registry']->link('mail/showFilters'),
+    'url' => $GLOBALS['registry']->hasMethod('mail/showFilters') ? $GLOBALS['registry']->link('mail/showFilters') : '',
     'img' => 'filters.png',
     'desc' => _("Edit your Filter Rules"),
     'help' => 'filter-edit-rules'
@@ -1342,7 +1342,7 @@ $_prefs['filters_link'] = array(
 $_prefs['filters_blacklist_link'] = array(
     'type' => 'link',
     'img' => 'filters.png',
-    'url' => $GLOBALS['registry']->link('mail/showBlacklist'),
+    'url' => $GLOBALS['registry']->hasMethod('mail/showBlacklist') ? $GLOBALS['registry']->link('mail/showBlacklist') : '',
     'desc' => _("Edit your Blacklist"),
     'help' => 'filter-edit-blacklist'
 );
@@ -1350,7 +1350,7 @@ $_prefs['filters_blacklist_link'] = array(
 $_prefs['filters_whitelist_link'] = array(
     'type' => 'link',
     'img' => 'filters.png',
-    'url' => $GLOBALS['registry']->link('mail/showWhitelist'),
+    'url' => $GLOBALS['registry']->hasMethod('mail/showWhitelist') ? $GLOBALS['registry']->link('mail/showWhitelist') : '',
     'desc' => _("Edit your Whitelist"),
     'help' => 'filter-edit-whitelist'
 );