From 28bfe4dc80a1431655666cfb3cec30f89e3459c7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 23 Mar 2007 14:54:39 -0400
Subject: [PATCH] Fixed bugs #1484276 and #1484300
---
program/include/rcube_imap.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 438922b..d4235fa 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -2272,7 +2272,7 @@
function _mod_mailbox($mbox_name, $mode='in')
{
- if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
+ if (empty($mbox_name) || (!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
return $mbox_name;
if (!empty($this->root_dir) && $mode=='in')
@@ -2309,12 +2309,12 @@
function get_id($uid, $mbox_name=NULL)
{
- return $this->_uid2id($uid, $mbox_name);
+ return $this->_uid2id($uid, $this->_mod_mailbox($mbox_name));
}
function get_uid($id,$mbox_name=NULL)
{
- return $this->_id2uid($id, $mbox_name);
+ return $this->_id2uid($id, $this->_mod_mailbox($mbox_name));
}
function _uid2id($uid, $mbox_name=NULL)
--
Gitblit v1.9.1