From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sun, 28 Jun 2009 02:35:21 +0000 (-0600)
Subject: Bug #8383: Correctly remove null from mailbox name
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f75d5434dc25fe8a8bd9a4856e9eaa045a88fd75;p=horde.git

Bug #8383: Correctly remove null from mailbox name
---

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 38f0e5e36..94591f98f 100644
--- 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 d03dc3dd4..ba2fa3e8c 100644
--- 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);
     }
 
     /**