Don't use static access to IMP_Filter; autoloading.

diff --git a/imp/lib/Block/Foldersummary.php b/imp/lib/Block/Foldersummary.php
index be1ad27..123c8c3 100644 (file)
--- a/imp/lib/Block/Foldersummary.php
+++ b/imp/lib/Block/Foldersummary.php
@@ -20,7 +20,8 @@ class IMP_Block_Foldersummary extends Horde_Block
 
         /* Filter on INBOX display, if requested. */
         if ($GLOBALS['prefs']->getValue('filter_on_display')) {
-            IMP_Filter::filter('INBOX');
+            $imp_filter = new IMP_Filter();
+            $imp_filter->filter('INBOX');
         }
 
         /* Get list of mailboxes to poll. */

diff --git a/imp/lib/Block/Newmail.php b/imp/lib/Block/Newmail.php
index 2bdf456..9ee0387 100644 (file)
--- a/imp/lib/Block/Newmail.php
+++ b/imp/lib/Block/Newmail.php
@@ -23,7 +23,8 @@ class IMP_Block_Newmail extends Horde_Block
 
         /* Filter on INBOX display, if requested. */
         if ($GLOBALS['prefs']->getValue('filter_on_display')) {
-            IMP_Filter::filter('INBOX');
+            $imp_filter = new IMP_Filter();
+            $imp_filter->filter('INBOX');
         }
 
         $query = new Horde_Imap_Client_Search_Query();

diff --git a/imp/lib/Block/summary.php b/imp/lib/Block/summary.php
index 63b64bd..d66c645 100644 (file)
--- a/imp/lib/Block/summary.php
+++ b/imp/lib/Block/summary.php
@@ -50,8 +50,8 @@ class Horde_Block_imp_summary extends Horde_Block
 
         /* Filter on INBOX display, if requested. */
         if ($prefs->getValue('filter_on_display')) {
-            require_once IMP_BASE . '/lib/Filter.php';
-            IMP_Filter::filter('INBOX');
+            $imp_filter = new IMP_Filter();
+            $imp_filter->filter('INBOX');
         }
 
         /* Get list of mailboxes to poll. */

diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index 997a472..1c31e68 100644 (file)
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -27,7 +27,6 @@ class Horde_Block_imp_tree_folders extends Horde_Block
 
         /* Run filters now */
         if ($GLOBALS['prefs']->getValue('filter_on_sidebar')) {
-            require_once IMP_BASE . '/lib/Filter.php';
             $imp_filter = new IMP_Filter();
             $imp_filter->filter('INBOX');
         }