Bug #8383: Correctly remove null from mailbox name

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 38f0e5e..94591f9 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -138,7 +138,7 @@ class IMP
      */
     static public function getLabel($mbox)
     {
-        return ($GLOBALS['imp_search']->isSearchMbox($mbox))
+        return IMP_Search::isSearchMbox($mbox)
             ? $GLOBALS['imp_search']->getLabel($mbox)
             : self::displayFolder($mbox);
     }

diff --git a/imp/lib/Search.php b/imp/lib/Search.php
index d03dc3d..ba2fa3e 100644 (file)
--- a/imp/lib/Search.php
+++ b/imp/lib/Search.php
@@ -269,7 +269,7 @@ class IMP_Search
     public function getLabel($id = null)
     {
         $id = $this->_strip($id);
-        return (isset($_SESSION['imp']['search']['q'][$id]['label']))
+        return isset($_SESSION['imp']['search']['q'][$id]['label'])
             ? $_SESSION['imp']['search']['q'][$id]['label']
             : '';
     }
@@ -666,7 +666,7 @@ class IMP_Search
         $pos = strpos($id, null);
         return ($pos === false)
             ? $id
-            : substr($id, $pos);
+            : substr($id, $pos + 1);
     }
 
     /**