From 49d3ac3a67792e002a4b0bf339d44f8003465d33 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 14 Jan 2009 23:34:33 -0700 Subject: [PATCH] Don't use static access to IMP_Filter; autoloading. --- imp/lib/Block/Foldersummary.php | 3 ++- imp/lib/Block/Newmail.php | 3 ++- imp/lib/Block/summary.php | 4 ++-- imp/lib/Block/tree_folders.php | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/imp/lib/Block/Foldersummary.php b/imp/lib/Block/Foldersummary.php index be1ad273d..123c8c3c1 100644 --- 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 2bdf45632..9ee03877e 100644 --- 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 63b64bdff..d66c645c6 100644 --- 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 997a472b3..1c31e68bb 100644 --- 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'); } -- 2.11.0