Fix encoding of IDX_SEP character.

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index a1af6a1..3010f92 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -31,8 +31,8 @@ class IMP
     const MAILBOX_START_FIRSTPAGE = 3;
     const MAILBOX_START_LASTPAGE = 4;
 
-    /* IMP internaltring used to separate indexes. */
-    const IDX_SEP = "\0";
+    /* IMP internal string used to separate indexes. */
+    const IDX_SEP = '\0';
 
     /* Are we currently in "print" mode? */
     static public $printMode = false;

diff --git a/imp/mailbox.php b/imp/mailbox.php
index fbb2765..0d8b031 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -735,7 +735,7 @@ while (list(,$ob) = each($mbox_info['overview'])) {
         'preview' => '',
         'status' => '',
         'size' => htmlspecialchars($imp_ui->getSize($ob['size'])),
-        'uid' => htmlspecialchars($ob['uid'] . IMP::IDX_SEP . $ob['mailbox']),
+        'uid' => $ob['uid'] . IMP::IDX_SEP . htmlspecialchars($ob['mailbox']),
     );
 
     /* Since this value will be used for an ID element, it cannot contain