isSearchMbox() should not be a static function

diff --git a/imp/lib/base.php b/imp/lib/base.php
index 814b863..70d5be7 100644 (file)
--- 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.