summaryrefslogtreecommitdiff
path: root/program/include/rcube_imap.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-03-23 18:54:39 +0000
committerthomascube <thomas@roundcube.net>2007-03-23 18:54:39 +0000
commit28bfe4dc80a1431655666cfb3cec30f89e3459c7 (patch)
tree56e074bc2a86456cdd1fb94ec5ec550cffdeab24 /program/include/rcube_imap.inc
parent8451fa4eb65976669bcfd345024e912067308795 (diff)
Fixed bugs #1484276 and #1484300
Diffstat (limited to 'program/include/rcube_imap.inc')
-rw-r--r--program/include/rcube_imap.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 438922b0a..d4235fac4 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -2272,7 +2272,7 @@ class rcube_imap
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 @@ class rcube_imap
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)