From a904072bab3eac4fcdbb7918ad0a50d1bee6644b Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 20 May 2009 12:43:40 -0600 Subject: [PATCH] isSearchMbox() should not be a static function --- imp/lib/base.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/imp/lib/base.php b/imp/lib/base.php index 814b86383..70d5be723 100644 --- a/imp/lib/base.php +++ b/imp/lib/base.php @@ -204,9 +204,7 @@ if ((IMP::loginTasksFlag() === 2) && $GLOBALS['imp_mbox'] = IMP::getCurrentMailboxInfo(); // Initialize IMP_Search object. -$GLOBALS['imp_search'] = (isset($_SESSION['imp']) && IMP_Search::isSearchMbox($GLOBALS['imp_mbox']['mailbox'])) - ? new IMP_Search(array('id' => $GLOBALS['imp_mbox']['mailbox'])) - : new IMP_Search(); +$GLOBALS['imp_search'] = new IMP_Search(array('id' => (isset($_SESSION['imp']) && strpos($GLOBALS['imp_mbox']['mailbox'], IMP::SEARCH_MBOX) === 0) ? $GLOBALS['imp_mbox']['mailbox'] : null)); if ($viewmode == 'mimp') { // Mobile markup renderer. -- 2.11.0