From ae4d7497f23ca7d0d07860f237896e6e4490e594 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 25 May 2007 17:55:09 -0400
Subject: [PATCH] Fix buggy imap_root settings (closes #1484379)
---
program/include/rcube_imap.inc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index dc18454..9ca6cf5 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -2275,7 +2275,7 @@
function _mod_mailbox($mbox_name, $mode='in')
{
- if (empty($mbox_name) || (!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
+ if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
return $mbox_name;
if (!empty($this->root_dir) && $mode=='in')
@@ -2312,12 +2312,14 @@
function get_id($uid, $mbox_name=NULL)
{
- return $this->_uid2id($uid, $this->_mod_mailbox($mbox_name));
+ $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ return $this->_uid2id($uid, $mailbox);
}
function get_uid($id,$mbox_name=NULL)
{
- return $this->_id2uid($id, $this->_mod_mailbox($mbox_name));
+ $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ return $this->_id2uid($id, $mailbox);
}
function _uid2id($uid, $mbox_name=NULL)
--
Gitblit v1.9.1