From 9cc250d126621d9aab5d13b73e02687f96ecc661 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 21 Jul 2009 16:27:31 -0600
Subject: [PATCH] Fix encoding of IDX_SEP character.

---
 imp/lib/IMP.php | 4 ++--
 imp/mailbox.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index a1af6a14b..3010f9237 100644
--- 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 fbb2765af..0d8b0313e 100644
--- 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
-- 
2.11.0