diff options
author | alecpl <alec@alec.pl> | 2010-03-12 10:12:22 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2010-03-12 10:12:22 +0000 |
commit | 5027c326e9bf2c4c6ad8ab2aed3673ae83bd2b2c (patch) | |
tree | 91be9c1526b0400a9e1de869737d6b2327150156 | |
parent | 7244b4500e2b685cee5e9c4746a87f12acb56297 (diff) |
-remove root_ns setting as useless, should fix #1486222
-rw-r--r-- | program/include/rcube_imap.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 66e6fa76b..cb8299607 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -43,7 +43,6 @@ class rcube_imap { var $db; var $conn; - var $root_ns = ''; var $root_dir = ''; var $mailbox = 'INBOX'; var $list_page = 1; @@ -145,10 +144,7 @@ class rcube_imap if ($this->conn) { if (!empty($this->conn->rootdir)) - { $this->set_rootdir($this->conn->rootdir); - $this->root_ns = preg_replace('/[.\/]$/', '', $this->conn->rootdir); - } if (empty($this->delimiter)) $this->get_hierarchy_delimiter(); } @@ -2925,7 +2921,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 ($mbox_name == 'INBOX') return $mbox_name; if (!empty($this->root_dir)) { |